---
anaconda | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++
scripts/upd-instroot | 6 +++-
2 files changed, 92 insertions(+), 1 deletions(-)
diff --git a/anaconda b/anaconda
index d3c65a2..6955c87 100755
--- a/anaconda
+++ b/anaconda
@@ -60,6 +60,88 @@ def startMetacityWM():
sys.exit(0)
return childpid
+def startPanel():
+ childpid = os.fork()
+ if not childpid:
+ cmd = '/usr/bin/fbpanel'
+ if not os.access(cmd, os.X_OK):
+ log.error("Unable to find the panel binary")
+ sys.exit(1)
+
+ buf = """
+Global {
+ edge = top
+ allign = center
+ margin = 0
+ widthtype = percent
+ width = 100
+ height = 24
+ transparent = true
+ tintcolor = #ffffff
+ alpha = 28
+ setdocktype = true
+ setpartialstrut = true
+ autohide = false
+ heightWhenHidden = 2
+ roundcorners = false
+ layer = none
+}
+
+Plugin {
+ expand = true
+ type = space
+ config {
+ size = 10
+ }
+}
+
+Plugin {
+ type = tray
+}
+
+Plugin {
+# expand = true
+ type = space
+ config {
+ size = 10
+ }
+}
+
+"""
+ fd = open("/usr/share/fbpanel/anaconda", "w")
+ fd.write(buf)
+ fd.close()
+
+ args = ["--profile", "anaconda" ]
+ rc = iutil.execWithRedirect(cmd, args,
+ stdout='/dev/null', stderr='/dev/null')
+ if rc:
+ log.error("Error running panel.")
+ sys.exit (rc)
+ else:
+ log.info("The panel has terminated.")
+ sys.exit(0)
+ return childpid
+
+def startNMApplet():
+ childpid = os.fork()
+ if not childpid:
+ cmd = '/usr/bin/nm-applet'
+ if not os.access(cmd, os.X_OK):
+ log.error("Unable to find the nm-applet binary.")
+ sys.exit(1)
+ args = ['--sm-disable']
+ rc = iutil.execWithRedirect(cmd, args,
+ stdout='/dev/null', stderr='/dev/null')
+ if rc:
+ log.error("Error running nm-applet.")
+ sys.exit (rc)
+ else:
+ log.info("nm-applet has terminated.")
+ sys.exit(0)
+ return childpid
+
+
def startAuditDaemon():
childpid = os.fork()
if not childpid:
@@ -899,6 +981,11 @@ if __name__ == "__main__":
else:
kickstart.setSteps(anaconda)
+ if anaconda.displayMode == 'g' and not flags.livecdInstall:
+ anaconda.network.write()
+ startPanel()
+ startNMApplet()
+
try:
anaconda.intf.run(anaconda)
except SystemExit, code:
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index e95b7e0..4be002d 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -236,7 +236,7 @@ PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda
device-mapper-multipath device-mapper-multipath-libs
dhclient dmraid dmraid-libs
dogtail dosfstools e2fsprogs e2fsprogs-libs echo-icon-theme ethtool
- elfutils-libelf expat fcoe-utils
+ elfutils-libelf expat fbpanel fcoe-utils
firstboot fontconfig fonts-ISO8859-2 freetype gail gawk gdb-gdbserver
gdk-pixbuf gfs2-utils glib2 glibc-common gnome-python2-canvas gnome-python2-gconf
gnome-themes gobject-introspection gpm grep gtk2 gtk2-engines
@@ -616,6 +616,7 @@ usr/bin/dbus-launch
usr/bin/du
usr/bin/eject
usr/bin/expr
+usr/bin/fbpanel
usr/bin/gdb-gdbserver
usr/bin/gdialog
usr/bin/gdk-pixbuf-query-loaders*
@@ -634,6 +635,7 @@ usr/bin/maketilo
usr/bin/md5sum
usr/bin/metacity
usr/bin/mkzimage
+usr/bin/nm-applet
usr/bin/nm-connection-editor
usr/bin/nslookup
usr/bin/pango*
@@ -662,6 +664,7 @@ usr/bin/xkbcomp
usr/bin/xrandr
usr/bin/zenity
usr/$LIBDIR/anaconda
+usr/$LIBDIR/fbpanel
usr/lib/kernel-wrapper
usr/lib/locale
usr/lib/python?.?
@@ -726,6 +729,7 @@ usr/share/anaconda
usr/share/anaconda/anaconda.conf
usr/share/cracklib
usr/share/dbus-1
+usr/share/fbpanel
usr/share/fontconfig
usr/share/fonts/*/lklug.ttf
usr/share/fonts/lohit*/*
--
1.7.2
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
