added man support to rescue mode, ala bug #81628

2 files changed, 35 insertions, 1 deletions

diff --git a/rescue.py b/rescue.py
index c1b48ce9f..4bdce6a7a 100644
--- a/rescue.py
+++ b/rescue.py
@@ -270,7 +270,32 @@ def runRescue(instPath, mountroot, id):
 
 		# set a library path to use mounted fs
 		os.environ["LD_LIBRARY_PATH"] =  "/lib:/usr/lib:/usr/X11R6/lib:/usr/kerberos/lib:/mnt/usr/lib:/mnt/sysimage/lib:/mnt/sysimage/usr/lib:/mnt/sysimage/usr/kerberos/lib:/mnt/sysimage/usr/X11R6/lib"
+
+		# get man pages to work
+		os.environ["MANPATH"] = "/mnt/sysimage/usr/share/man:/mnt/sysimage/usr/local/share/man"
+
+		# find groff data dir
+		try:
+		    glst = os.listdir["/mnt/sysimage/usr/share/groff"]
+
+		    # find a directory which is a numeral, its where
+		    # data files are
+		    for gdir in glst:
+			try:
+			    gversion = float(gdir)
+			except:
+			    gversion = None
+			    continue
+		except:
+		    gversion = None
+
+		if gversion is not None:
+		    gpath = "/mnt/sysimage/usr/share/groff/"+gversion
+		    os.environ["GROFF_FONT_PATH"] = gpath + '/font'
+		    os.environ["GROFF_TMAC_PATH"] = gpath + '/tmac'
+		    
 		    
+			
 	except:
 	    # This looks horrible, but all it does is catch every exception,
 	    # and reraise those in the tuple check. This lets programming
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 58e386a80..9ca91f0f5 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -152,7 +152,7 @@ PACKAGESGR="anaconda XFree86-libs libpng XFree86-75dpi-fonts
 # these packages are combined with the PACKAGES and PACKAGESGR for big stage 2
 #
 PACKAGESRESCUE="bzip2 bzip2-libs dump
-                findutils ftp gzip iputils joe krb5-libs less 
+                findutils ftp gzip iputils joe krb5-libs less man
                 modutils mtools mt-st mtr net-tools open 
                 openssh openssh-clients pciutils rsh traceroute tar"
 
@@ -465,6 +465,7 @@ etc/fb.modes
 etc/gtk-2.0/gtkrc*
 etc/im_palette.pal
 etc/imrc
+etc/man.config
 etc/pango/*
 etc/fonts/*
 $LIBDIR/libnss_dns*
@@ -813,6 +814,14 @@ EOF
 
 cp $DEST/etc/nsswitch.conf $DESTGR/etc/nsswitch.conf
 
+# fixup man.config to point into /mnt/sysimage for rescue
+echo "Fixing up /etc/man.config to point into /mnt/sysimage"
+if [ -n "$NEEDGR" ];
+    mv $DESTGR/etc/man.config $DESTGR/etc/man.config-old
+    cat $DESTGR/etc/man.config-old | sed 's^/usr/bin^/mnt/sysimage/usr/bin^' | sed 's^/bin/cat^/mnt/sysimage/usr/bin/cat^' | sed 's^/bin/gunzip^/mnt/sysimage/usr/bin/gunzip^' > $DESTGR/etc/man.config
+    rm -f $DESTGR/etc/man.config-old
+fi
+
 echo "Running mkfontdir..."
 if [ -n "$NEEDGR" ]; then
     /usr/X11R6/bin/mkfontdir -p /usr/X11R6/lib/X11/fonts/encodings/ -e $DESTGR/usr/X11R6/lib/X11/fonts/encodings $DESTGR/usr/X11R6/lib/X11/fonts/* $DESTGR/usr/share/fonts/ISO8859-9/*