diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-05 12:58:57 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-05 12:58:57 +0000 |
commit | 55d68353a541f363a196d51eac01b6a3ab8c54a4 (patch) | |
tree | 041da3bf21685d908c42ea77be5b6be2e87e4d17 /packages/initscripts | |
parent | 94e1ce507e69378472f22faedd6606eb91510e6a (diff) | |
parent | bab0c48ac5132ad63b4f3da27a1c39c20b5db86c (diff) |
merge of '2409f1286888442abc1534359db7a59eb6d8b5fd'
and 'f42403739ba7106ebfe92b3af59bf9c81b54f06d'
Diffstat (limited to 'packages/initscripts')
-rwxr-xr-x | packages/initscripts/initscripts-1.0/checkroot.sh | 6 | ||||
-rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh index f3b8a0cd45..5c1e5c6ebb 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 @@ -140,7 +140,7 @@ else esac test `uname -m` = s390 && spinner="" # This should go away test "$VERBOSE" != no && echo "Checking root filesystem..." - fsck $spinner $force $fix / + fsck $spinner $force $fix / </dev/null RTC=$? # # If there was a failure, drop into single-user mode. diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 06a12c04a5..bcc3aa2c35 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 = "r102" SRC_URI = "file://functions \ file://halt \ |