Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl (Moody) 2022-03-20 05:45:10 +01:00
commit bae1378181
3 changed files with 4 additions and 3 deletions

View File

@ -84,7 +84,7 @@ run()
[ -r /etc/sysconfig/rc.site ] && source /etc/sysconfig/rc.site [ -r /etc/sysconfig/rc.site ] && source /etc/sysconfig/rc.site
DISTRO=${DISTRO:-"Linux From Scratch"} DISTRO=${DISTRO:-"Linux From Scratch"}
DISTRO_CONTACT=${DISTRO_CONTACT:-"lfs-dev@linuxfromscratch.org (Registration required)"} DISTRO_CONTACT=${DISTRO_CONTACT:-"lfs-dev@lists.linuxfromscratch.org (Registration required)"}
DISTRO_MINI=${DISTRO_MINI:-"LFS"} DISTRO_MINI=${DISTRO_MINI:-"LFS"}
IPROMPT=${IPROMPT:-"no"} IPROMPT=${IPROMPT:-"no"}

View File

@ -4,7 +4,7 @@
# Distro Information # Distro Information
# These values, if specified here, override the defaults # These values, if specified here, override the defaults
#DISTRO="Linux From Scratch" # The distro name #DISTRO="Linux From Scratch" # The distro name
#DISTRO_CONTACT="lfs-dev@linuxfromscratch.org" # Bug report address #DISTRO_CONTACT="lfs-dev@lists.linuxfromscratch.org" # Bug report address
#DISTRO_MINI="LFS" # Short name used in filenames for distro config #DISTRO_MINI="LFS" # Short name used in filenames for distro config
# Define custom colors used in messages printed to the screen # Define custom colors used in messages printed to the screen

View File

@ -77,7 +77,8 @@ l6:6:wait:/etc/rc.d/init.d/rc 6
ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
su:S016:once:/sbin/sulogin su:S06:once:/sbin/sulogin
s1:1:respawn:/sbin/sulogin
1:2345:respawn:/sbin/agetty --noclear tty1 9600 1:2345:respawn:/sbin/agetty --noclear tty1 9600
2:2345:respawn:/sbin/agetty tty2 9600 2:2345:respawn:/sbin/agetty tty2 9600