carbon-config

commit 892dbb95c802609b69f8a29d2b01004a61c5eadf
parent 16e55eafd0131507c7535ebea568ac4120a77686
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Tue, 26 Jul 2022 21:47:22 +0200

zsh as root shell, sh quoting for consistency

Diffstat:
M
postinstall.aat
 | 
6
+++---
M
postinstall.fileset
 | 
22
+++++++++++-----------

2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/postinstall.aat b/postinstall.aat
@@ -87,8 +87,8 @@ CN	# Managed by /usr/src/core-system
 |for(n in extlinux_modules) {
 |	mod = extlinux_modules[n]
 /boot/{{mod}}	+
-?	cmp $fname '/usr/share/syslinux/{{mod}}'
-!	cp -va '/usr/share/syslinux/{{mod}}' $fname
+?	cmp "$fname" '/usr/share/syslinux/{{mod}}'
+!	cp -va '/usr/share/syslinux/{{mod}}' "$fname"
 |}
 
 /etc	+
@@ -96,7 +96,7 @@ CN	# Managed by /usr/src/core-system
 |line_append_file("sshd:x", ":22:", "", "^[^:]*:[^:]*")
 
 /etc/passwd	f	+
-!f	sed -iEe 's|^(root:.*:)[^:]|/bin/zsh|'
+!f	sed -iEe 's|^(root:.*:)[^:]|/bin/zsh|' "$fname"
 |passwd_user("sshd:x:22:22:server privilege separation,,,:/home/sshd:/sbin/nologin")
 |shadow_user("sshd:!:10000::::::")
 
diff --git a/postinstall.fileset b/postinstall.fileset
@@ -20,20 +20,20 @@ CN	# Managed by /usr/src/core-system
 	  INITRD initramfs-virt
 	  APPEND root=/dev/mapper/vg-spark_root init=/previous/init/bin/init modules=sd-mod,usb-storage,ext4,xfs,lvm rootflags=noatime
 /boot/libutil.c32	+
-?	cmp $fname '/usr/share/syslinux/libutil.c32'
-!	cp -va '/usr/share/syslinux/libutil.c32' $fname
+?	cmp "$fname" '/usr/share/syslinux/libutil.c32'
+!	cp -va '/usr/share/syslinux/libutil.c32' "$fname"
 /boot/libcom32.c32	+
-?	cmp $fname '/usr/share/syslinux/libcom32.c32'
-!	cp -va '/usr/share/syslinux/libcom32.c32' $fname
+?	cmp "$fname" '/usr/share/syslinux/libcom32.c32'
+!	cp -va '/usr/share/syslinux/libcom32.c32' "$fname"
 /boot/mboot.c32	+
-?	cmp $fname '/usr/share/syslinux/mboot.c32'
-!	cp -va '/usr/share/syslinux/mboot.c32' $fname
+?	cmp "$fname" '/usr/share/syslinux/mboot.c32'
+!	cp -va '/usr/share/syslinux/mboot.c32' "$fname"
 /boot/menu.c32	+
-?	cmp $fname '/usr/share/syslinux/menu.c32'
-!	cp -va '/usr/share/syslinux/menu.c32' $fname
+?	cmp "$fname" '/usr/share/syslinux/menu.c32'
+!	cp -va '/usr/share/syslinux/menu.c32' "$fname"
 /boot/vesamenu.c32	+
-?	cmp $fname '/usr/share/syslinux/vesamenu.c32'
-!	cp -va '/usr/share/syslinux/vesamenu.c32' $fname
+?	cmp "$fname" '/usr/share/syslinux/vesamenu.c32'
+!	cp -va '/usr/share/syslinux/vesamenu.c32' "$fname"
 
 /etc	+
 /etc/group	+
@@ -45,7 +45,7 @@ CN	# Managed by /usr/src/core-system
 	fi
 
 /etc/passwd	f	+
-!f	sed -iEe 's|^(root:.*:)[^:]|/bin/zsh|'
+!f	sed -iEe 's|^(root:.*:)[^:]|/bin/zsh|' "$fname"
 /etc/passwd	f	+
 !f	awk 'BEGIN { FS=OFS=":"; seen=0; line="sshd:x:22:22:server privilege separation,,,:/home/sshd:/sbin/nologin"; split(line, a) }
 	{ uids[$3] = $0 }