diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-05-07 00:32:47 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-05-07 00:32:47 +0000 |
| commit | 0af1290e79f6d482be943cadb292c1f3c44c3aab (patch) | |
| tree | db606da3fdfafa7e5a4745703c482aa46d0c7259 /packages | |
| parent | 5a9f53c93da41fe05be3cd1ec53df79c77add595 (diff) | |
| parent | 5ac063a41073fbd98e8bdb703a0bcc1b8b13ff93 (diff) | |
merge of 'cfa8d2cb144f036d07edfe4d470a48c730645c51'
and 'd9305e9051bbce7371ad1d5da3fb95bb80bd399c'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/sysconf/files/conffiles | 1 | ||||
| -rw-r--r-- | packages/sysconf/files/sysconf | 3 | ||||
| -rw-r--r-- | packages/sysconf/sysconf_0.1.bb | 2 |
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 ... |