diff options
| author | Chris Lumens <clumens@redhat.com> | 2007-06-14 21:44:55 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2007-06-14 21:44:55 +0000 |
| commit | f6bb1c7947b8c4378181c44515288937cc72cd72 (patch) | |
| tree | ae00972eddee4f32b7afb224eab837cfc8a1cc99 | |
| parent | ac0c0e896cda31af6e7765f5bb981dfab9fbe54a (diff) | |
| download | anaconda-f6bb1c7947b8c4378181c44515288937cc72cd72.tar.gz anaconda-f6bb1c7947b8c4378181c44515288937cc72cd72.tar.xz anaconda-f6bb1c7947b8c4378181c44515288937cc72cd72.zip | |
Fixes from buildinstall logs.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | command-stubs/Makefile | 2 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2007-06-14 Chris Lumens <clumens@redhat.com> + + * command-stubs/Makefile: pump-stub -> dhclient-stub. + + * scripts/upd-instroot: Only make the joe symlinks if /etc/joe + exists. + 2007-06-15 David Cantrell <dcantrell@redhat.com> * kickstart.py (ZFCP.parse): Flush drive dict so zFCP devices are diff --git a/command-stubs/Makefile b/command-stubs/Makefile index d0d1c8fea..e832594a5 100644 --- a/command-stubs/Makefile +++ b/command-stubs/Makefile @@ -1,7 +1,7 @@ include ../Makefile.inc STUBS = raidstart-stub raidstop-stub kudzu-probe-stub list-harddrives-stub \ - loadkeys-stub losetup-stub pump-stub mknod-stub syslogd-stub + loadkeys-stub losetup-stub dhcpclient-stub mknod-stub syslogd-stub all: @echo "Nothing to do" diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 5143101f9..53ff4e4ad 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -1017,7 +1017,7 @@ LC_ALL=C comm -13 $DESTGR/locales $DESTGR/locales.list | xargs rm -rf rm -f $DESTGR/locales $DESTGR/locales.list # fixup joe links -if [ -n "$NEEDGR" ]; then +if [ -n "$NEEDGR" -a -d "$DESTDIR"/etc/joe ]; then ln -fs jpicorc $DESTGR/etc/joe/picorc ln -fs jpicorc $DESTGR/etc/joe/jnanorc ln -fs jpicorc $DESTGR/etc/joe/nanorc |