r2248
dslinux_sonny_jim at dslinux.in-berlin.de
dslinux_sonny_jim at dslinux.in-berlin.de
Sun Apr 20 18:37:50 CEST 2008
Author: sonny_jim
Date: 2008-04-20 18:37:50 +0200 (Sun, 20 Apr 2008)
New Revision: 2248
Log:
Add e2fsck to init scripts, enable in DLDI builds
Modified: trunk/vendors/Nintendo/DLDI-EXT2/Makefile
===================================================================
--- trunk/vendors/Nintendo/DLDI-EXT2/Makefile 2008-04-20 16:37:19 UTC (rev 2247)
+++ trunk/vendors/Nintendo/DLDI-EXT2/Makefile 2008-04-20 16:37:50 UTC (rev 2248)
@@ -45,6 +45,7 @@
\
mtd0,c,90,0 firmware,c,90,2 \
\
+ tun,c,10,200 \
tty0,c,4,0 tty1,c,4,1 tty2,c,4,2 tty3,c,4,3 \
tty4,c,4,4 tty5,c,4,5 tty6,c,4,6 tty7,c,4,7 \
\
@@ -81,7 +82,7 @@
$(ROMFSINST) $(NDS_COMMON)/rc.common /etc/rc.common
$(ROMFSINST) $(NDS_COMMON)/rc.defaults /etc/rc.defaults
$(ROMFSINST) $(NDS_COMMON)/rc.d /etc/rc.d
- $(ROMFSINST) $(NDS_COMMON)/passwd /etc/passwd
+ #$(ROMFSINST) $(NDS_COMMON)/passwd /etc/passwd
$(ROMFSINST) -p +x $(NDS_COMMON)/default.script /usr/share/udhcpc/default.script
echo "$(VERSIONSTR) -- " `date` > $(ROMFSDIR)/etc/version
for i in `find $(ROMFSDIR)/$(FATFS)/linux -type d -empty` ; do touch $$i/.keep; done
Modified: trunk/vendors/Nintendo/DLDI-EXT2/config.linux-2.6.x
===================================================================
--- trunk/vendors/Nintendo/DLDI-EXT2/config.linux-2.6.x 2008-04-20 16:37:19 UTC (rev 2247)
+++ trunk/vendors/Nintendo/DLDI-EXT2/config.linux-2.6.x 2008-04-20 16:37:50 UTC (rev 2248)
@@ -744,16 +744,16 @@
#
# Network File Systems
#
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
+# CONFIG_NFS_FS is not set
+# CONFIG_NFS_V3 is not set
# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
+# CONFIG_LOCKD is not set
+# CONFIG_LOCKD_V4 is not set
+# CONFIG_NFS_COMMON is not set
+# CONFIG_SUNRPC is not set
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
Modified: trunk/vendors/Nintendo/DLDI-EXT2/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI-EXT2/config.vendor 2008-04-20 16:37:19 UTC (rev 2247)
+++ trunk/vendors/Nintendo/DLDI-EXT2/config.vendor 2008-04-20 16:37:50 UTC (rev 2248)
@@ -155,7 +155,7 @@
#
# EXT2
#
-# CONFIG_USER_E2FSPROGS_E2FSCK_E2FSCK is not set
+CONFIG_USER_E2FSPROGS_E2FSCK_E2FSCK=y
# CONFIG_USER_E2FSPROGS_MISC_MKE2FS is not set
# CONFIG_USER_E2FSPROGS_MISC_BADBLOCKS is not set
# CONFIG_USER_E2FSPROGS_MISC_CHATTR is not set
@@ -702,9 +702,9 @@
# CONFIG_USER_BUSYBOX_IFUPDOWN is not set
# CONFIG_USER_BUSYBOX_INETD is not set
# CONFIG_USER_BUSYBOX_INIT is not set
-CONFIG_USER_BUSYBOX_INSMOD=y
+# CONFIG_USER_BUSYBOX_INSMOD is not set
# CONFIG_USER_BUSYBOX_LSMOD is not set
-CONFIG_USER_BUSYBOX_MODPROBE=y
+# CONFIG_USER_BUSYBOX_MODPROBE is not set
# CONFIG_USER_BUSYBOX_RMMOD is not set
# CONFIG_USER_BUSYBOX_2_2_MODULES is not set
# CONFIG_USER_BUSYBOX_2_4_MODULES is not set
Modified: trunk/vendors/Nintendo/DLDI-EXT2/rc
===================================================================
--- trunk/vendors/Nintendo/DLDI-EXT2/rc 2008-04-20 16:37:19 UTC (rev 2247)
+++ trunk/vendors/Nintendo/DLDI-EXT2/rc 2008-04-20 16:37:50 UTC (rev 2248)
@@ -10,9 +10,31 @@
mount -t ramfs none /var/run
if [ "$checkfsonboot" = "YES" ]
then
- echo "Checking filesystems"
- e2fsck -n /dev/dldi2
- dosfsck /dev/dldi1
+ echo "Starting fsck"
+ echo "Remounting / read-only"
+ umount -r /
+ echo "Checking /"
+
+ if e2fsck -n /dev/dldi2
+ then echo "Filesystem OK"
+ else
+ echo "============================================"
+ echo "WARNING! Root filesystem needs manual repair"
+ echo " Please issue the following commands "
+ echo "============================================"
+ echo "umount -r /"
+ echo "e2fsck /dev/dldi2"
+ echo "mount -o remount,rw /"
+ echo "/etc/rc.d/shutdown"
+ fi
+ echo "Remounting /"
+ mount -o remount,rw /
+ echo "Checking VFAT"
+ if dosfsck /dev/dldi1
+ then echo "VFAT OK"
+ else
+ echo "WARNING! Manual repair needed for /dev/dldi1"
+ fi
else
echo "Not checking filesystems on boot"
echo "set checkfsonboot="YES" in /etc/rc.conf to enable"
More information about the dslinux-commit
mailing list