diff options
| author | Rod Whitby <rod@whitby.id.au> | 2009-02-09 04:38:31 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2009-02-09 04:38:31 +0000 |
| commit | 121f43bd68c80c1c15d1d9ec5cfe83ffb33e3fbb (patch) | |
| tree | 1fb7c8ad4ad5fe8e69b0a1e2749cbde9868d4607 /packages/slugos-init | |
| parent | 66192bbdaab409dff4b6f812dbd5c07cd943cdac (diff) | |
| parent | 7f4149db1ab21d402bd448431a57e31dddfc578d (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'packages/slugos-init')
| -rw-r--r-- | packages/slugos-init/files/sysconf | 8 | ||||
| -rw-r--r-- | packages/slugos-init/slugos-init_5.0.bb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/slugos-init/files/sysconf b/packages/slugos-init/files/sysconf index 3059a466da..8d59d5d6f3 100644 --- a/packages/slugos-init/files/sysconf +++ b/packages/slugos-init/files/sysconf @@ -381,7 +381,7 @@ sysconf_restore_conffiles(){ else echo "sysconf_restore_conffiles: $file: timestamp copy failed (ignored)" >&2 fi - elif test -h "$saved/file" -o -h "$ffsdir/$file" + elif test -h "$saved/$file" -o -h "$ffsdir/$file" then # new or old symbolic link if test -h "$saved/$file" -a -h "$ffsdir/$file" && @@ -396,7 +396,7 @@ sysconf_restore_conffiles(){ echo "$file" echo "$file" >&3;; diff) # need user input - if sysconf_verify_link "$file" <>/dev/tty >&0 2>&0 + if sysconf_verify_link "$file" </dev/tty >/dev/tty 2>&1 then echo "$file" echo "$file" >&3 @@ -420,7 +420,7 @@ sysconf_restore_conffiles(){ echo "$file" echo "$file" >&3;; diff) # the files are different, get user input - if sysconf_verify "$file" <>/dev/tty >&0 2>&0 + if sysconf_verify "$file" </dev/tty >/dev/tty 2>&1 then echo "$file" echo "$file" >&3 @@ -456,7 +456,7 @@ sysconf_test_restore(){ elif test "$file" = "etc/.configured" then : # special handling - elif test -h "$saved/file" -o -h "$ffsdir/$file" + elif test -h "$saved/$file" -o -h "$ffsdir/$file" then # new or old symbolic link if test -h "$saved/$file" -a -h "$ffsdir/$file" && diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb index e7a45a94aa..7d4769d6e9 100644 --- a/packages/slugos-init/slugos-init_5.0.bb +++ b/packages/slugos-init/slugos-init_5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r8" +PR = "r9" SRC_URI = "file://boot/flash \ file://boot/disk \ |