Author: pierre
Date: Sat Aug 22 04:49:09 2020
New Revision: 4200

Log:
Create os-release also for SysV

This has been in the book for a few months, but jhalfs was not updated.
It is now...

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==============================================================================
--- jhalfs/trunk/LFS/master.sh  Sat Aug 22 04:47:10 2020        (r4199)
+++ jhalfs/trunk/LFS/master.sh  Sat Aug 22 04:49:09 2020        (r4200)
@@ -308,25 +308,6 @@
 all:   ck_UID ck_terminal mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT 
create-sbu_du-report mk_BLFS_TOOL mk_CUSTOM_TOOLS
 $teardownat
        @sudo make do_housekeeping
-EOF
-) >> $MKFILE
-if [ "$INITSYS" = systemd ]; then
-(
-    cat << EOF
-       @/bin/echo -e -n \\
-       NAME=\\"Linux From Scratch\\"\\\\n\\
-       VERSION=\\"$VERSION\\"\\\\n\\
-       ID=lfs\\\\n\\
-       PRETTY_NAME=\\"Linux From Scratch $VERSION\\"\\\\n\\
-       VERSION_CODENAME=\\"$(whoami)-jhalfs\\"\\\\n\\
-       > os-release && \\
-       sudo mv os-release \$(MOUNT_PT)/etc && \\
-       sudo chown root:root \$(MOUNT_PT)/etc/os-release
-EOF
-) >> $MKFILE
-fi
-(
-    cat << EOF
        @echo $VERSION > lfs-release && \\
        sudo mv lfs-release \$(MOUNT_PT)/etc && \\
        sudo chown root:root \$(MOUNT_PT)/etc/lfs-release
@@ -338,6 +319,15 @@
        > lsb-release && \\
        sudo mv lsb-release \$(MOUNT_PT)/etc && \\
        sudo chown root:root \$(MOUNT_PT)/etc/lsb-release
+       @/bin/echo -e -n \\
+       NAME=\\"Linux From Scratch\\"\\\\n\\
+       VERSION=\\"$VERSION\\"\\\\n\\
+       ID=lfs\\\\n\\
+       PRETTY_NAME=\\"Linux From Scratch $VERSION\\"\\\\n\\
+       VERSION_CODENAME=\\"$(whoami)-jhalfs\\"\\\\n\\
+       > os-release && \\
+       sudo mv os-release \$(MOUNT_PT)/etc && \\
+       sudo chown root:root \$(MOUNT_PT)/etc/os-release
        @\$(call echo_finished,$VERSION)
 
 ck_UID:
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

Reply via email to