From 56db2d500b4b656628a6e542ecfd9f8a10075665 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sat, 12 Aug 2017 20:55:06 -0500 Subject: split group into arch-specific files --- adelie-build-cd | 53 ++---------------- adelie-build-cd.1 | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ cdinit-ppc | Bin 0 -> 69128 bytes group-ppc | 32 +++++++++++ group-x86 | 33 +++++++++++ group-x86_64 | 33 +++++++++++ ofboot.b | 64 ++++++++++++++++++++++ passwd-ppc | 18 ++++++ passwd-x86 | 20 +++++++ passwd-x86_64 | 25 +++++++++ shadow-ppc | 18 ++++++ shadow-x86 | 20 +++++++ shadow-x86_64 | 25 +++++++++ 13 files changed, 453 insertions(+), 49 deletions(-) create mode 100644 adelie-build-cd.1 create mode 100755 cdinit-ppc create mode 100644 group-ppc create mode 100644 group-x86 create mode 100644 group-x86_64 create mode 100644 ofboot.b create mode 100644 passwd-ppc create mode 100644 passwd-x86 create mode 100644 passwd-x86_64 create mode 100644 shadow-ppc create mode 100644 shadow-x86 create mode 100644 shadow-x86_64 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 diff --git a/adelie-build-cd.1 b/adelie-build-cd.1 new file mode 100644 index 0000000..a56d019 --- /dev/null +++ b/adelie-build-cd.1 @@ -0,0 +1,161 @@ +.Dd January 29, 2017 +.Dt ADELIE-BUILD-CD 8 SMM +.Os "Adélie Linux" + + +.Sh NAME +.Nm adelie-build-cd +.Nd create an Adélie Linux live CD image or install media + + +.Sh SYNOPSIS +.Nm +.Op Fl a Ar ARCH +.Op Fl f +.Op Fl p Ar PHASE + + +.Sh DESCRIPTION +.Nm +creates a live CD image or installer CD image for Adélie Linux using +.Xr apk 8 +and +.Xr mkisofs 8 . + +.Bl -tag -width "-p PHASE" -offset indent -compact +.It Fl a Ar ARCH +You may specify any architecture available in the Adélie repository for +.Ar ARCH ; +however, some architectures may require you to have additional utilities +present on your system to be made bootable. Specifically, x86 and x86_64 +require +.Xr syslinux 1 +to be installed. This defaults to the currently running system's architecture +as reported by +.Xr uname 1 . +.It Fl f +Specifies that a full installation image should be created, including a +.Pa packages/ +directory containing .apk files that can be used for an offline install. If +this flag is not specified, a live image will be created instead. +.It Fl p Ar PHASE +Specifies the phase of image creation to make as specified in the +.Sy Phases +section. +.El + + +.Ss Phases + +The +.Nm +utility defines the following phases for +.Fl p , +which can be run independently, or can be run in order by specifying the special +.Sy all +phase. + +.Bl -tag -width "install" -offset indent -compact +.It clean +Erase all temporary files. Typically required for predictable build results. +.It install +Install packages to the squash root. If +.Fl f +is specified, additionally create the package root and copy .apk files to it. +.It initrd +Generate the initrd contents in the initrd root, and create the initrd file +from it. +.It iso +Run +.Xr mksquashfs 1 +on the squash root, copy the kernel to the CD root, run any +architecture-specific scripts necessary to make the CD bootable, and then run +.Xr mkisofs 8 +to create the .ISO file. +.It all +Run all of the above phases in the above order. This is the default if +.Fl p +is not specified. +.El + + +.Sh ENVIRONMENT + +.Bl -tag -width "EXTRA_MIRROR" -offset indent -compact +.It Ev Sy LDARCH +If the musl ld library file is different from the apk arch (such as ppc vs +ld-musl-powerpc.so.1), you may specify the name of the ld architecture as +.Ev LDARCH . +.It Ev Sy EXTRA_MIRROR +For architectures that have subarchitectures (such as x86 with i486 and i525), +you may specify the extra mirror directory to use as +.Ev EXTRA_MIRROR . +.It Ev Sy SIGNING_KEY +If you specify +.Fl f +you may sign the created package index by pointing to your private key in +.Ev SIGNING_KEY . +.El + + +.Sh FILES + +.Bl -ohang -width "iso-params-$ARCH" -offset indent -compact +.It Pa iso-params-$ARCH +A list of additional parameters to provide to +.Xr mkisofs 8 +when generating the ISO image for the specified architecture. This is used to +specify the correct layout for bootable discs on that architecture. +.Pp +.It Pa packages-$ARCH +A list of architecture-specific packages to install on the created media, in +addition to the default packages installed on every architecture. This is +typically used for bootloaders and firmware manipulation packages. It can also +be used to provide further debugging tools (such as +.Xr gdb 1 +or +.Xr strace 1 +and so on) on architectures that are still experimental. +.Pp +.It Pa post-$ARCH.sh +If this file exists and is executable, it will be run just before +.Xr mkisofs 8 +to do any final preparation to the disc root before creating the image. +.El + + +.Sh EXAMPLES + +adelie-build-cd -a x86_64 +.Pp +LDARCH=powerpc adelie-build-cd -a ppc +.Pp +EXTRA_MIRROR=i525 LDARCH=i386 SIGNING_KEY=/etc/portage/adelie.key ./build-cd -a x86 + + +.Sh SEE ALSO + +.Xr mksquashfs 1 , +.Xr apk 8 , +.Xr mkisofs 8 . + + +.Sh HISTORY + +The +.Nm +command first appeared during the 1.0 ALPHA1 phase. It is written in portable +.St -p1003.2a-92 +shell language. Any deviation from the standard should be considered a bug. + + +.Sh AUTHORS + +.An A. Wilcox +.Aq awilfox@adelielinux.org + + +.Sh BUGS + +There is no way to specify packages that should only be included on a full disc +or live disc. All disc types have the same packages installed. diff --git a/cdinit-ppc b/cdinit-ppc new file mode 100755 index 0000000..5739320 Binary files /dev/null and b/cdinit-ppc differ diff --git a/group-ppc b/group-ppc new file mode 100644 index 0000000..072eb0e --- /dev/null +++ b/group-ppc @@ -0,0 +1,32 @@ +root:x:0:root +tty:x:5: +wheel:x:10:live +mail:x:12:postfix +uucp:x:14: +man:x:15: +cron:x:16: +console:x:17: +audio:x:18: +cdrom:x:19: +sshd:x:22: +at:x:25: +video:x:27:live +games:x:35: +apache:x:81: +usb:x:85: +users:x:100: +clamav:x:200: +scanner:x:201: +sddm:x:202: +rtkit:x:203: +polkitd:x:204: +plugdev:x:205: +fcron:x:206: +postfix:x:207: +postdrop:x:208: +postmaster:x:245: +messagebus:x:246: +crontab:x:248: +input:x:249: +utmp:x:406: +live:x:1000: diff --git a/group-x86 b/group-x86 new file mode 100644 index 0000000..b0e2908 --- /dev/null +++ b/group-x86 @@ -0,0 +1,33 @@ +root:x:0:root +tty:x:5: +wheel:x:10:live +mail:x:12:postfix +uucp:x:14: +man:x:15: +cron:x:16: +console:x:17: +audio:x:18: +cdrom:x:19: +sshd:x:22: +at:x:25: +video:x:27:live +games:x:35: +apache:x:81: +usb:x:85: +users:x:100: +uptimed:x:103: +sddm:x:104: +clamav:x:105: +rtkit:x:117: +polkitd:x:118: +plugdev:x:119: +scanner:x:120: +messagebus:x:121: +postmaster:x:122: +ntp:x:123: +postfix:x:207: +postdrop:x:208: +fcron:x:248: +input:x:249: +utmp:x:406: +live:x:1000: diff --git a/group-x86_64 b/group-x86_64 new file mode 100644 index 0000000..fad1d03 --- /dev/null +++ b/group-x86_64 @@ -0,0 +1,33 @@ +root:x:0:root +tty:x:5: +wheel:x:10:live +mail:x:12:postfix +uucp:x:14: +man:x:15: +cron:x:16: +audio:x:18: +sshd:x:22: +at:x:25: +games:x:35: +apache:x:81: +users:x:100: +uptimed:x:101: +unbound:x:102: +nofiles:x:103: +clamav:x:104: +sddm:x:105: +lpadmin:x:106: +ntp:x:123: +lp:x:199: +rtkit:x:200: +plugdev:x:201: +polkitd:x:202: +messagebus:x:203: +scanner:x:204: +input:x:205: +fcron:x:206: +postfix:x:207: +postdrop:x:208: +postmaster:x:249: +utmp:x:406: +live:x:1000: diff --git a/ofboot.b b/ofboot.b new file mode 100644 index 0000000..0598597 --- /dev/null +++ b/ofboot.b @@ -0,0 +1,64 @@ + + +MacRISC MacRISC3 MacRISC4 + + +Adelie + + +" screen" output +load-base release-load-area +boot &device;:\grub + + +1010 +000000000000F8FEACF6000000000000 +0000000000F5FFFFFEFEF50000000000 +00000000002BFAFEFAFCF70000000000 +0000000000F65D5857812B0000000000 +0000000000F5350B2F88560000000000 +0000000000F6335708F8FE0000000000 +00000000005600F600F5FD8100000000 +00000000F9F8000000F5FAFFF8000000 +000000008100F5F50000F6FEFE000000 +000000F8F700F500F50000FCFFF70000 +00000088F70000F50000F5FCFF2B0000 +0000002F582A00F5000008ADE02C0000 +00090B0A35A62B0000002D3B350A0000 +000A0A0B0B3BF60000505E0B0A0B0A00 +002E350B0B2F87FAFCF45F0B2E090000 +00000007335FF82BF72B575907000000 +000000000000ACFFFF81000000000000 +000000000081FFFFFFFF810000000000 +0000000000FBFFFFFFFFAC0000000000 +000000000081DFDFDFFFFB0000000000 +000000000081DD5F83FFFD0000000000 +000000000081DDDF5EACFF0000000000 +0000000000FDF981F981FFFF00000000 +00000000FFACF9F9F981FFFFAC000000 +00000000FFF98181F9F981FFFF000000 +000000ACACF981F981F9F9FFFFAC0000 +000000FFACF9F981F9F981FFFFFB0000 +00000083DFFBF981F9F95EFFFFFC0000 +005F5F5FDDFFFBF9F9F983DDDD5F0000 +005F5F5F5FDD81F9F9E7DF5F5F5F5F00 +0083DD5F5F83FFFFFFFFDF5F835F0000 +000000FBDDDFACFBACFBDFDFFB000000 +000000000000FFFFFFFF000000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFFFF00000000 +00000000FFFFFFFFFFFFFFFFFF000000 +00000000FFFFFFFFFFFFFFFFFF000000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 +00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 +00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFF000000 + + diff --git a/passwd-ppc b/passwd-ppc new file mode 100644 index 0000000..aedc61b --- /dev/null +++ b/passwd-ppc @@ -0,0 +1,18 @@ +root:x:0:0:Charlie Root:/root:/bin/bash +mail:x:8:12:Portable mailer daemon user:/var/spool/mail:/sbin/nologin +man:x:13:15:man-db:/usr/share/man:/sbin/nologin +postmaster:x:14:245:Portable postmaster user:/var/spool/mail:/sbin/nologin +cron:x:16:16:Portable cron daemon user:/var/spool/cron:/sbin/nologin +sshd:x:22:22:SSH Daemon unprivileged user:/var/empty:/sbin/nologin +at:x:25:25:at daemon:/var/spool/at/atjobs:/sbin/nologin +games:x:36:35:Games metauser:/usr/games:/bin/bash +apache:x:81:81:Apache daemon user:/var/www:/sbin/nologin +messagebus:x:102:246:DBus unprivileged user:/dev/null:/sbin/nologin +fcron:x:103:206:fcron daemon user:/dev/null:/sbin/nologin +polkitd:x:104:204:PolicyKit unprivileged user:/var/lib/polkit-1:/sbin/nologin +rtkit:x:105:203:RTKit unprivileged user:/dev/null:/sbin/nologin +sddm:x:106:202:X Display Manager user:/var/lib/sddm:/sbin/nologin +saned:x:107:201:Scanner unprivileged user:/dev/null:/sbin/nologin +clamav:x:108:200:Anti-Virus Daemon user:/dev/null:/sbin/nologin +postfix:x:207:207:Postfix unprivileged user:/var/spool/postfix:/sbin/nologin +live:x:1000:1000:Live User:/home/live:/bin/bash diff --git a/passwd-x86 b/passwd-x86 new file mode 100644 index 0000000..26f13ea --- /dev/null +++ b/passwd-x86 @@ -0,0 +1,20 @@ +root:x:0:0:Charlie Root:/root:/bin/bash +mail:x:8:12:Portable mailer daemon user:/var/spool/mail:/sbin/nologin +man:x:13:15:man-db:/usr/share/man:/sbin/nologin +postmaster:x:14:122:Portable postmaster user:/var/spool/mail:/sbin/nologin +cron:x:16:16:Portable cron daemon user:/var/spool/cron:/sbin/nologin +sshd:x:22:22:SSH Daemon unprivileged user:/var/empty:/sbin/nologin +at:x:25:25:at daemon:/var/spool/at/atjobs:/sbin/nologin +games:x:36:35:Games metauser:/usr/games:/bin/bash +apache:x:81:81:Apache daemon user:/var/www:/sbin/nologin +fcron:x:101:248:fcron daemon user:/dev/null:/sbin/nologin +messagebus:x:102:121:DBus unprivileged user:/dev/null:/sbin/nologin +saned:x:103:120:Scanner unprivileged user:/dev/null:/sbin/nologin +polkitd:x:104:118:PolicyKit unprivileged user:/var/lib/polkit-1:/sbin/nologin +rtkit:x:105:117:RTKit unprivileged user:/dev/null:/sbin/nologin +clamav:x:106:105:Anti-Virus Daemon user:/dev/null:/sbin/nologin +sddm:x:107:104:X Display Manager user:/var/lib/sddm:/sbin/nologin +uptimed:x:108:103:Uptime Daemon unprivileged user:/dev/null:/sbin/nologin +ntp:x:123:123:Network Time Synchronisation daemon user:/dev/null:/sbin/nologin +postfix:x:207:207:Postfix unprivileged user:/var/spool/postfix:/sbin/nologin +live:x:1000:1000:Live User:/home/live:/bin/bash diff --git a/passwd-x86_64 b/passwd-x86_64 new file mode 100644 index 0000000..a2c6229 --- /dev/null +++ b/passwd-x86_64 @@ -0,0 +1,25 @@ +root:x:0:0:Charlie Root:/root:/bin/bash +mail:x:8:12:Portable mailer daemon user:/var/spool/mail:/sbin/nologin +man:x:13:15:man-db:/usr/share/man:/sbin/nologin +postmaster:x:14:249:Portable postmaster user:/var/spool/mail:/sbin/nologin +cron:x:16:16:Portable cron daemon user:/var/spool/cron:/sbin/nologin +sshd:x:22:22:SSH Daemon unprivileged user:/var/empty:/sbin/nologin +at:x:25:25:at daemon:/var/spool/at/atjobs:/sbin/nologin +games:x:36:35:Games metauser:/usr/games:/bin/bash +apache:x:81:81:Apache daemon user:/var/www:/sbin/nologin +fcron:x:101:206:fcron daemon user:/dev/null:/sbin/nologin +saned:x:102:204:Scanner unprivileged user:/dev/null:/sbin/nologin +messagebus:x:103:203:DBus unprivileged user:/dev/null:/sbin/nologin +polkitd:x:104:202:PolicyKit unprivileged user:/var/lib/polkit-1:/sbin/nologin +rtkit:x:105:200:RTKit unprivileged user:/dev/null:/sbin/nologin +lp:x:106:199:Printer daemon user:/dev/null:/sbin/nologin +sddm:x:107:105:X Display Manager user:/var/lib/sddm:/sbin/nologin +clamav:x:108:104:Anti-Virus Daemon user:/dev/null:/sbin/nologin +dnscache:x:109:103:DNS Caching user:/dev/null:/sbin/nologin +dnslog:x:110:103:DNS Logging user:/dev/null:/sbin/nologin +tinydns:x:111:103:DNS Resolver user:/dev/null:/sbin/nologin +unbound:x:112:102:DNS Resolver user:/etc/unbound:/sbin/nologin +uptimed:x:112:101:Uptime Daemon unprivileged user:/dev/null:/sbin/nologin +ntp:x:123:123:Network Time Synchronisation daemon user:/dev/null:/sbin/nologin +postfix:x:207:207:Postfix unprivileged user:/var/spool/postfix:/sbin/nologin +live:x:1000:1000:Live User:/home/live:/bin/bash diff --git a/shadow-ppc b/shadow-ppc new file mode 100644 index 0000000..f81d4e5 --- /dev/null +++ b/shadow-ppc @@ -0,0 +1,18 @@ +root:::::::: +mail:::::::: +man:::::::: +postmaster:::::::: +cron:::::::: +sshd:::::::: +at:::::::: +games:::::::: +apache:::::::: +fcron:::::::: +saned:::::::: +messagebus:::::::: +polkitd:::::::: +rtkit:::::::: +sddm:::::::: +clamav:::::::: +postfix:::::::: +live:::::::: diff --git a/shadow-x86 b/shadow-x86 new file mode 100644 index 0000000..31e21a2 --- /dev/null +++ b/shadow-x86 @@ -0,0 +1,20 @@ +root:::::::: +mail:::::::: +man:::::::: +postmaster:::::::: +cron:::::::: +sshd:::::::: +at:::::::: +games:::::::: +apache:::::::: +fcron:::::::: +saned:::::::: +messagebus:::::::: +polkitd:::::::: +rtkit:::::::: +sddm:::::::: +clamav:::::::: +uptimed:::::::: +ntp:::::::: +postfix:::::::: +live:::::::: diff --git a/shadow-x86_64 b/shadow-x86_64 new file mode 100644 index 0000000..0a67e43 --- /dev/null +++ b/shadow-x86_64 @@ -0,0 +1,25 @@ +root:::::::: +mail:::::::: +man:::::::: +postmaster:::::::: +cron:::::::: +sshd:::::::: +at:::::::: +games:::::::: +apache:::::::: +fcron:::::::: +saned:::::::: +messagebus:::::::: +polkitd:::::::: +rtkit:::::::: +lp:::::::: +sddm:::::::: +clamav:::::::: +dnscache:::::::: +dnslog:::::::: +tinydns:::::::: +unbound:::::::: +uptimed:::::::: +ntp:::::::: +postfix:::::::: +live:::::::: -- cgit v1.2.3-70-g09d2