summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/base-files/base-files/h2200/fstab2
-rw-r--r--packages/base-files/base-files/h3600/fstab2
-rw-r--r--packages/base-files/base-files/h3900/fstab4
-rw-r--r--packages/base-files/base-files/h5000/fstab2
-rw-r--r--packages/base-files/base-files/hx4700/fstab2
-rw-r--r--packages/base-files/base-files/jornada56x/fstab2
-rw-r--r--packages/base-files/base-files_3.0.14.bb2
-rwxr-xr-xpackages/initscripts/initscripts-1.0/checkroot.sh4
-rw-r--r--packages/initscripts/initscripts_1.0.bb2
-rw-r--r--packages/sysvinit/sysvinit/rcS-default2
-rw-r--r--packages/sysvinit/sysvinit_2.86.bb2
11 files changed, 13 insertions, 13 deletions
diff --git a/packages/base-files/base-files/h2200/fstab b/packages/base-files/base-files/h2200/fstab
index 8243195d99..5063f84359 100644
--- a/packages/base-files/base-files/h2200/fstab
+++ b/packages/base-files/base-files/h2200/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock3 / jffs2 defaults 1 1
+rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
sys /sys sysfs defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
diff --git a/packages/base-files/base-files/h3600/fstab b/packages/base-files/base-files/h3600/fstab
index 92293a59af..9ec7df1928 100644
--- a/packages/base-files/base-files/h3600/fstab
+++ b/packages/base-files/base-files/h3600/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock4 / jffs2 defaults 1 1
+rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0
/dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0
diff --git a/packages/base-files/base-files/h3900/fstab b/packages/base-files/base-files/h3900/fstab
index 2a106ef945..9ec7df1928 100644
--- a/packages/base-files/base-files/h3900/fstab
+++ b/packages/base-files/base-files/h3900/fstab
@@ -1,6 +1,4 @@
-/dev/mtdblock/1 / jffs2 defaults 1 1
-#breaks h51xx
-#/dev/mtdblock/2 /home jffs2 defaults 1 1
+rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0
/dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0
diff --git a/packages/base-files/base-files/h5000/fstab b/packages/base-files/base-files/h5000/fstab
index 4d3c38eca8..ad05f3b799 100644
--- a/packages/base-files/base-files/h5000/fstab
+++ b/packages/base-files/base-files/h5000/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock1 / jffs2 defaults 1 1
+rootfs / auto defaults 1 1
#breaks h51xx
/dev/mtdblock2 /home jffs2 defaults 1 1
proc /proc proc defaults 0 0
diff --git a/packages/base-files/base-files/hx4700/fstab b/packages/base-files/base-files/hx4700/fstab
index 04ac4849fd..49b5c96030 100644
--- a/packages/base-files/base-files/hx4700/fstab
+++ b/packages/base-files/base-files/hx4700/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock2 / jffs2 defaults 1 1
+rootfs / auto defaults 1 1
/dev/mtdblock3 /home jffs2 defaults 1 1
proc /proc proc defaults 0 0
diff --git a/packages/base-files/base-files/jornada56x/fstab b/packages/base-files/base-files/jornada56x/fstab
index d8258a0c05..de6e192fa1 100644
--- a/packages/base-files/base-files/jornada56x/fstab
+++ b/packages/base-files/base-files/jornada56x/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock1 / jffs2 rw,noatime 1 1
+rootfs / auto rw,noatime 1 1
proc /proc proc defaults 0 0
/dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 0d3a411095..0661f8e045 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
-PR = "r72"
+PR = "r73"
LICENSE = "GPL"
SRC_URI = " \
diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh
index f3b8a0cd45..76bedcf4bd 100755
--- a/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -60,9 +60,9 @@ do
test "$pass" = 0 -o "$pass" = "" && rootcheck=no
- # Enable fsck for ext2 and ext3 rootfs, disable for everything else
+ # Allow fsck for ext2 and ext3 rootfs, disable for everything else
case "$type" in
- ext2|ext3) rootcheck=yes;;
+ ext2|ext3) ;;
*) rootcheck=no;;
esac
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 06a12c04a5..52413a727d 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r100"
+PR = "r101"
SRC_URI = "file://functions \
file://halt \
diff --git a/packages/sysvinit/sysvinit/rcS-default b/packages/sysvinit/sysvinit/rcS-default
index 82bf55970c..7ad3c7bf8f 100644
--- a/packages/sysvinit/sysvinit/rcS-default
+++ b/packages/sysvinit/sysvinit/rcS-default
@@ -15,6 +15,8 @@ DELAYLOGIN=no
VERBOSE=no
# Set EDITMOTD to "no" if you don't want /etc/motd to be editted automatically
EDITMOTD=no
+# Whether to fsck root on boot
+ENABLE_ROOTFS_FSCK=no
# Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup.
FSCKFIX=yes
# Set TICKADJ to the correct tick value for this specific machine
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index a4ce1252f8..f87c3f917a 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init."
SECTION = "base"
LICENSE = "GPL"
HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r35"
+PR = "r36"
# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
# Set PACKAGE_ARCH appropriately.