diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | command-stubs/Makefile | 2 | ||||
| -rwxr-xr-x | command-stubs/rescue-startx-stub | 23 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 1 |
4 files changed, 6 insertions, 25 deletions
@@ -1,3 +1,8 @@ +2006-04-19 Chris Lumens <clumens@redhat.com> + + * command-stubs/rescue-startx-stub: Removed. + * scripts/upd-instroot: Likewise. + 2006-04-18 David Cantrell <dcantrell@redhat.com> * urlinstall.py: Remove some traceonly mode stuff. diff --git a/command-stubs/Makefile b/command-stubs/Makefile index b69270f18..e68983bba 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 rescue-startx-stub + loadkeys-stub losetup-stub pump-stub mknod-stub all: @echo "Nothing to do" diff --git a/command-stubs/rescue-startx-stub b/command-stubs/rescue-startx-stub deleted file mode 100755 index 3659efef9..000000000 --- a/command-stubs/rescue-startx-stub +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/python -# -# -# Stub to start X in rescue mode with twm and an xterm -# - -import os, sys -import rhpxl.xserver as xserver -import rhpl.keyboard as keyboard - -# see if its even possible -if not os.access("/mnt/sysimage/usr/X11R6/bin/xterm", os.X_OK) or not os.access("/mnt/sysimage/usr/X11R6/bin/twm", os.X_OK): - print "Must have mounted an existing installation in rescue mode to work." - sys.exit(0) - -if len(sys.argv) > 1: - mode = sys.argv[1] -else: - mode = '800x600' - -xserver.probeHWandStartXServer(mode) -os.system("xterm&") -os.system("twm") diff --git a/scripts/upd-instroot b/scripts/upd-instroot index dc2b33886..05b9d8d13 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -1172,7 +1172,6 @@ for p in $DEST $DESTGR; do cp $p/usr/lib/anaconda/kudzu-probe-stub $p/usr/bin/kudzu-probe cp $p/usr/lib/anaconda/loadkeys-stub $p/usr/bin/loadkeys cp $p/usr/lib/anaconda/mknod-stub $p/usr/bin/mknod - cp $p/usr/lib/anaconda/rescue-startx-stub $p/usr/bin/rescue-startx mv $p/usr/sbin/anaconda $p/usr/bin/anaconda mv $p/usr/lib/anaconda-runtime/lib* $p/usr/$LIBDIR |