diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-05-17 19:24:23 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-05-17 19:24:23 +0000 |
| commit | dd8734fb36d95b8faca5db0a9967f7828fc75433 (patch) | |
| tree | 326a78a014ab11806f5e2b0060706e755412c1b6 /packages/sysconf | |
| parent | 3ded06f5504f9a7b60b67aa9e280c3d3da2366f8 (diff) | |
| parent | 09d0c6da109b9c875800dd46ff7d848c153322f4 (diff) | |
merge of '093b89e2fccb4864b6f56bcb61c6455a90dc384e'
and 'a87cb9fd512dbac5e9ea1f2571e2c946278a28ad'
Diffstat (limited to 'packages/sysconf')
| -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 ... |