diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-06-27 15:28:57 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-06-27 15:28:57 +0000 |
| commit | b1d994b64292dad1f055313ac772df977308dbf3 (patch) | |
| tree | 6211253dfbb2723966748b5f1afdcf7b1f56f796 | |
| parent | 598c96de7e549712a760a3d4c862692989879c5f (diff) | |
| parent | 595766d291827e33593df3e58ec304c76c994048 (diff) | |
merge of '87d56af8b268b54c15065d21ee44d5a9ccbdbada'
and 'a274867aa1114b795903e870451c68c2892dbea1'
| -rw-r--r-- | packages/slugos-init/files/initscripts/umountinitrd.sh | 2 | ||||
| -rw-r--r-- | packages/slugos-init/slugos-init_0.10.bb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/slugos-init/files/initscripts/umountinitrd.sh b/packages/slugos-init/files/initscripts/umountinitrd.sh index 2798fe5985..93f05a00f6 100644 --- a/packages/slugos-init/files/initscripts/umountinitrd.sh +++ b/packages/slugos-init/files/initscripts/umountinitrd.sh @@ -20,6 +20,8 @@ do umount /mnt;; /initrd)# need the device for a remount ffsdev="$(mtblockdev $ffspart)" + [ -n "$ffsdev" ] || \ + ffsdev="$(mtblockdev rootfs)" echo "Remounting $ffsdev read-only on /initrd" >&2 if test -n "$ffsdev" -a -b "$ffsdev" then diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 4afe433ead..8e08a3d755 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r85" +PR = "r86" SRC_URI = "file://boot/flash \ file://boot/disk \ |