summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-05-13 18:17:07 +0000
committerRod Whitby <rod@whitby.id.au>2007-05-13 18:17:07 +0000
commit8b3980363533e21ff2da9bfb12f66068b3280a77 (patch)
treee3f4511580bac2ea5191ba11365f324309947858 /packages
parenteaa8fa765519fafab0f77a2ba8daec6a21d75adf (diff)
parentfb1bf22bf1f99bf39062a414dc95b783af24e0eb (diff)
merge of '0c94e8c9c404fc1fc036b1618c97f2b818f86020'
and '9902ba0fe76179b445447bd044832fa5ba94171b'
Diffstat (limited to 'packages')
-rw-r--r--packages/sysconf/files/conffiles1
-rw-r--r--packages/sysconf/files/sysconf3
-rw-r--r--packages/sysconf/sysconf_0.1.bb2
3 files changed, 1 insertions, 5 deletions
diff --git a/packages/sysconf/files/conffiles b/packages/sysconf/files/conffiles
index d99047ce24..6e6842d6cd 100644
--- a/packages/sysconf/files/conffiles
+++ b/packages/sysconf/files/conffiles
@@ -20,7 +20,6 @@
# preserve Preserve this file unconditionally
# diff Compare file with the new version, ask if different
#
-preserve linuxrc
preserve etc/.configured
preserve etc/TZ
diff etc/default/conffiles
diff --git a/packages/sysconf/files/sysconf b/packages/sysconf/files/sysconf
index 9499b4daa9..cca4dd1e79 100644
--- a/packages/sysconf/files/sysconf
+++ b/packages/sysconf/files/sysconf
@@ -640,9 +640,6 @@ umountflash(){
return 1
fi
#
- # The function is currently always used interactively, so output
- echo "$0: umounting any existing mount of $ffsdev" >&2
- #
# check each mount point, do this last first because otherwise nested
# mounts of ffsdev cannot be umounted.
ffs_umount() {
diff --git a/packages/sysconf/sysconf_0.1.bb b/packages/sysconf/sysconf_0.1.bb
index fd37cd01f7..e6bb3f29bb 100644
--- a/packages/sysconf/sysconf_0.1.bb
+++ b/packages/sysconf/sysconf_0.1.bb
@@ -3,7 +3,7 @@ SECTION = "base"
PRIORITY = "optional"
LICENSE = "GPL"
RDEPENDS = "devio cpio findutils diffutils"
-PR = "r8"
+PR = "r9"
# Currently, the scripts only support ixp4xx machines.
# Feel free to add to the scripts ...