diff options
| -rw-r--r-- | base/aaabasicfs/.footprint | 1 | ||||
| -rw-r--r-- | base/aaabasicfs/.md5sum | 5 | ||||
| -rw-r--r-- | base/aaabasicfs/Pkgfile | 4 | ||||
| -rw-r--r-- | base/aaabasicfs/fstab | 4 | ||||
| -rw-r--r-- | base/aaabasicfs/lfs-bootscripts-01.patch | 21 |
5 files changed, 28 insertions, 7 deletions
diff --git a/base/aaabasicfs/.footprint b/base/aaabasicfs/.footprint index 8cd831ac0..a517eb331 100644 --- a/base/aaabasicfs/.footprint +++ b/base/aaabasicfs/.footprint @@ -88,6 +88,7 @@ lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S00mountkernfs -> ../init.d/mountkernf lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S02consolelog -> ../init.d/consolelog lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S05modules -> ../init.d/modules lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S10udev -> ../init.d/udev +lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S15setclock -> ../init.d/setclock lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S20checkfs -> ../init.d/checkfs lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S30mountfs -> ../init.d/mountfs lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S40swap -> ../init.d/swap diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum index 88553dd66..10ae6e7f8 100644 --- a/base/aaabasicfs/.md5sum +++ b/base/aaabasicfs/.md5sum @@ -9,12 +9,13 @@ 94e5b6c4017e28684a683d39cbe4c72a console 248d4faa838949085a51003b2c0c3f00 dircolors.sh ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh -93156932384c81b3b54ef0e47084c495 fstab +b37cf9bf000a04d5cc2e69550732a2e3 fstab 57ddbea584220ac4e74d0504a03721f4 hosts 7af11664c8a127c2d1e71ee3237ab543 i18n.sh 255dba011debefe08813959042bb56b4 inittab 2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc -c4d94790cc698886eba4f81b0c91cc5f lfs-bootscripts-20090817.tar.bz2 +43f14285886f0ffa3dd96a6dd9841611 lfs-bootscripts-01.patch +4dd57199e4c238f86cf5b781c946c31d lfs-bootscripts-20090817.tar.bz2 f2cdde506d446113e04153e5695adb2a message c90e6466720260c377c89f5aa0c47eca network 5478e2141b3d5504cd201b23dcc70531 nu diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile index 259800884..960d1a5e5 100644 --- a/base/aaabasicfs/Pkgfile +++ b/base/aaabasicfs/Pkgfile @@ -10,7 +10,7 @@ release=beta2 scriptsversion=lfs-bootscripts-20090817 source=( http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\ hosts clock console fstab inittab message inputrc network xorg.conf \ - profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc \ + profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc lfs-bootscripts-01.patch \ blfs-bootscripts nu readline.sh unmask.sh X.sh i18n.sh bashrc sysklogd cleanfs) @@ -122,6 +122,7 @@ EOF chmod -v 664 $PKG/var/run/utmp $PKG/var/log/lastlog # Bootscripts cd $scriptsversion + patch -Np1 -i ../lfs-bootscripts-01.patch make DESTDIR=$PKG install # We want to start the network when init 2 mv $PKG/etc/rc.d/rc2.d/{K80,S20}network @@ -191,6 +192,7 @@ EOF mv $PKG/etc/rc.d/$i/S{80,70}swap mv $PKG/etc/rc.d/$i/S{70,80}mountfs done + ln -s ../init.d/setclock $PKG/etc/rc.d/rcsysinit.d/S15setclock mv $PKG/etc/rc.d/rcsysinit.d/S{20,40}swap mv $PKG/etc/rc.d/rcsysinit.d/S{30,20}checkfs mv $PKG/etc/rc.d/rcsysinit.d/S{40,30}mountfs diff --git a/base/aaabasicfs/fstab b/base/aaabasicfs/fstab index 0a6491a71..b04b0a804 100644 --- a/base/aaabasicfs/fstab +++ b/base/aaabasicfs/fstab @@ -3,12 +3,8 @@ # file system mount-point type options dump fsck # order -/dev/sdax / reiserfs defaults 1 1 -#/dev/sda2 swap swap pri=1 0 0 /dev/sr0 /media/cdrom iso9660 ro,user,noauto,unhide 0 0 -# /dev/sda1 /media/key1 vfat user,noauto 0 0 proc /proc proc defaults 0 0 sysfs /sys sysfs defaults 0 0 devpts /dev/pts devpts gid=4,mode=620 0 0 shm /dev/shm tmpfs defaults 0 0 -# End /etc/fstab diff --git a/base/aaabasicfs/lfs-bootscripts-01.patch b/base/aaabasicfs/lfs-bootscripts-01.patch new file mode 100644 index 000000000..870f02cd3 --- /dev/null +++ b/base/aaabasicfs/lfs-bootscripts-01.patch @@ -0,0 +1,21 @@ +--- lfs-bootscripts-20090817/lfs/init.d/checkfs.orig 2009-10-02 21:54:45.000000000 +0000 ++++ lfs-bootscripts-20090817/lfs/init.d/checkfs 2009-10-02 21:56:21.000000000 +0000 +@@ -58,15 +58,15 @@ + boot_mesg -n "/forcefsck found, forcing file" ${INFO} + boot_mesg " system checks as requested." + echo_ok +- options="-f" ++ options="-A -C -T" + else +- options="" ++ options="-a -A -C -T" + fi + + boot_mesg "Checking file systems..." + # Note: -a option used to be -p; but this fails e.g. + # on fsck.minix +- fsck ${options} -a -A -C -T ++ fsck ${options} + error_value=${?} + + if [ "${error_value}" = 0 ]; then |