split group into arch-specific files

1 files changed, 4 insertions, 49 deletions

diff --git a/adelie-build-cd b/adelie-build-cd
index addaa92..8c031ff 100755
--- a/adelie-build-cd
+++ b/adelie-build-cd
@@ -134,7 +134,7 @@ install_pkgs() {
 		parted \
 		lvm2-openrc \
 		easy-kernel easy-kernel-modules easy-kernel-firmware genkernel \
-		dhcpcd net-tools bind-tools s6-dns \
+		bind-tools curl dhcpcd iproute2 iputils net-tools s6-dns traceroute \
 		ca-certificates \
 		rfkill wireless-tools wpa_supplicant \
 		pciutils libusb1 usbutils \
@@ -178,54 +178,9 @@ make_structure() {
 		proc	/proc		proc	defaults	0	1
 	FSTAB
 
-	cat >squashroot-$ARCH/etc/passwd <<- PASSWD
-		root:x:0:0:Charlie Root:/root:/bin/bash
-		man:x:13:15:man-db:/usr/share/man:/sbin/nologin
-		sshd:x:22:22:SSH daemon:/var/empty:/sbin/nologin
-		at:x:25:25:at:/var/spool/at/atjobs:/sbin/nologin
-		fcron:x:101:206:fcron:/dev/null:/sbin/nologin
-		messagebus:x:103:203:DBus unprivileged user:/dev/null:/sbin/nologin
-		polkit:x:104:202:PolicyKit unprivileged user:/dev/null:/sbin/nologin
-		rtkit:x:105:200:RTKit unprivileged user:/dev/null:/sbin/nologin
-		postfix:x:207:207:postfix:/var/spool/postfix:/sbin/nologin
-		live:x:1000:1000:Live User:/home/live:/bin/bash
-	PASSWD
-
-	cat >squashroot-$ARCH/etc/group <<- GROUP
-		root:x:0:
-		tty:x:5:
-		wheel:x:10:live
-		mail:x:12:postfix
-		uucp:x:14:
-		cron:x:16:
-		audio:x:18:
-		sshd:x:22:
-		at:x:25:
-		rtkit:x:200:
-		plugdev:x:201:
-		polkitd:x:202:
-		messagebus:x:203:
-		input:x:205:
-		fcron:x:206:
-		postfix:x:207:
-		postdrop:x:208:
-		postmaster:x:249:
-		utmp:x:406:
-		live:x:1000:
-	GROUP
-
-	cat >squashroot-$ARCH/etc/shadow <<- SHADOW
-		root::::::::
-		man::::::::
-		sshd::::::::
-		at::::::::
-		fcron::::::::
-		messagebus::::::::
-		polkit::::::::
-		rtkit::::::::
-		postfix::::::::
-		live::::::::
-	SHADOW
+	cp passwd-$ARCH squashroot-$ARCH/etc/passwd
+	cp group-$ARCH squashroot-$ARCH/etc/group
+	cp shadow-$ARCH squashroot-$ARCH/etc/shadow
 
 	cat >squashroot-$ARCH/etc/shells <<- SHELLS
 		/bin/bash