summaryrefslogtreecommitdiff
path: root/packages/sysconf/files
diff options
context:
space:
mode:
authorLeon Woestenberg <leon.woestenberg@gmail.com>2007-05-17 17:01:42 +0000
committerLeon Woestenberg <leon.woestenberg@gmail.com>2007-05-17 17:01:42 +0000
commit09d0c6da109b9c875800dd46ff7d848c153322f4 (patch)
tree7f7b769c987a65cc38bc27ca396ee0e5cc95cf8c /packages/sysconf/files
parent1a7668c797a0ce8728190d641c3a87d2e9ee312a (diff)
parent7605d989539a54cb2e6a00fba7cd3943bb9be7ec (diff)
merge of '0b283e6731fcecb8efe6007eaa4798a26df1938a'
and '49e541f0397109bdc6530a7380f2980a60d577ba'
Diffstat (limited to 'packages/sysconf/files')
-rw-r--r--packages/sysconf/files/conffiles1
-rw-r--r--packages/sysconf/files/sysconf3
2 files changed, 0 insertions, 4 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() {