summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-05-14 20:06:50 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-05-14 20:06:50 -0500
commit48b39984886ada55e8ffbfd0209b070266e7bf51 (patch)
treea6645b542bd5552c0feb593a831c184c8c8b5569
parent5ab540489c334190e28babba2d76e5b2ff4d3e60 (diff)
downloadimage-48b39984886ada55e8ffbfd0209b070266e7bf51.tar.gz
image-48b39984886ada55e8ffbfd0209b070266e7bf51.tar.bz2
image-48b39984886ada55e8ffbfd0209b070266e7bf51.tar.xz
image-48b39984886ada55e8ffbfd0209b070266e7bf51.zip
adelie-build-txz: Don't put OpenRC crap in mini rootfs
-rwxr-xr-xadelie-build-txz45
1 files changed, 25 insertions, 20 deletions
diff --git a/adelie-build-txz b/adelie-build-txz
index 2adb819..85ce46f 100755
--- a/adelie-build-txz
+++ b/adelie-build-txz
@@ -135,22 +135,34 @@ install_pkgs() {
}
make_structure() {
- mkdir -p rootfs-$ARCH/etc/runlevels/{sysinit,boot,default,shutdown}
+ if test -n "${MINI+mini}"; then
+ echo 'adelie-mini' > rootfs-$ARCH/etc/hostname
+ else
+ echo 'adelie-root' > rootfs-$ARCH/etc/hostname
+
+ mkdir -p rootfs-$ARCH/etc/runlevels/{sysinit,boot,default,shutdown}
+
+ echo 'mtab_is_file=no' > rootfs-$ARCH/etc/conf.d/mtab
- echo 'adelie-root' > rootfs-$ARCH/etc/hostname
- echo 'mtab_is_file=no' > rootfs-$ARCH/etc/conf.d/mtab
+ for siservice in udev udev-trigger lvmetad; do
+ ln -s /etc/init.d/$siservice \
+ rootfs-$ARCH/etc/runlevels/sysinit/$siservice
+ done
- for siservice in udev udev-trigger lvmetad; do
- ln -s /etc/init.d/$siservice \
- rootfs-$ARCH/etc/runlevels/sysinit/$siservice
- done
+ for bootservice in root binfmt bootmisc fsck hostname hwclock keymaps \
+ localmount loopback modules mtab procfs sysctl sysfsconf termencoding \
+ tmpfiles.setup urandom; do
+ ln -s /etc/init.d/$bootservice \
+ rootfs-$ARCH/etc/runlevels/boot/$bootservice
+ done
- for bootservice in root binfmt bootmisc fsck hostname hwclock keymaps \
- localmount loopback modules mtab procfs sysctl sysfsconf termencoding \
- tmpfiles.setup urandom; do
- ln -s /etc/init.d/$bootservice \
- rootfs-$ARCH/etc/runlevels/boot/$bootservice
- done
+ cp AdelieTux.icns rootfs-$ARCH/.VolumeIcon.icns
+
+ # Put a copy of the kernel(s) in the kernels-$ARCH/ directory, so that
+ # users may download them for netbooting or such.
+ mkdir -p out/kernels/$ARCH
+ cp -r rootfs-$ARCH/boot/* out/kernels/$ARCH/
+ fi
cat >rootfs-$ARCH/etc/fstab <<- FSTAB
# Welcome to Adélie Linux.
@@ -174,13 +186,6 @@ make_structure() {
https://distfiles.adelielinux.org/adelie/$VERSION/system/$EXTRA_MIRROR
https://distfiles.adelielinux.org/adelie/$VERSION/user/$EXTRA_MIRROR
REPOS
-
- cp AdelieTux.icns rootfs-$ARCH/.VolumeIcon.icns
-
- # Put a copy of the kernel(s) in the kernels-$ARCH/ directory, so that
- # users may download them for netbooting or such.
- mkdir -p out/kernels/$ARCH
- cp -r rootfs-$ARCH/boot/* out/kernels/$ARCH/
}
tar_it() {