[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 1/7] Add nm-connection-editor to stage2.



---
 configure.ac         |    2 +-
 scripts/mk-images    |   15 +++++++++------
 scripts/upd-instroot |   10 ++++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index c106c22..f9fc2a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 m4_define(python_required_version, 2.5)
 
 AC_PREREQ([2.63])
-AC_INIT([anaconda], [13.27], [anaconda-devel-list redhat com])
+AC_INIT([anaconda], [13.28], [anaconda-devel-list redhat com])
 AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2])
 
 AC_CONFIG_SRCDIR([loader/loader.c])
diff --git a/scripts/mk-images b/scripts/mk-images
index bc04a98..7101599 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -747,14 +747,17 @@ makeinitrd() {
     ( cd $IMGPATH/usr/share/polkit/actions
       cp -a org.freedesktop.policykit.policy $MBD_DIR/usr/share/polkit-1/actions
     )
+    cp -a $IMGPATH/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf $MBD_DIR/etc/dbus-1/system.d
+    cp -a $IMGPATH/etc/dbus-1/system.d/ConsoleKit.conf $MBD_DIR/etc/dbus-1/system.d
+    chmod 04755 $IMGPATH/usr/libexec/polkit-1/polkit-agent-helper-1
 
     # dbus
     instbin $IMGPATH /usr/bin/dbus-uuidgen $MBD_DIR /sbin/dbus-uuidgen
     instbin $IMGPATH /usr/bin/dbus-daemon $MBD_DIR /sbin/dbus-daemon
     cp -a $IMGPATH/etc/dbus-1/system.conf $MBD_DIR/etc/dbus-1/system.conf
+    chown root:dbus $IMGPATH/$LIBDIR/dbus-1/dbus-daemon-launch-helper
+    chmod 04750 $IMGPATH/$LIBDIR/dbus-1/dbus-daemon-launch-helper
     cp -a $IMGPATH/$LIBDIR/dbus-1/dbus-daemon-launch-helper $MBD_DIR/$LIBDIR/dbus-1
-    chown root:dbus $MBD_DIR/$LIBDIR/dbus-1/dbus-daemon-launch-helper
-    chmod 04750 $MBD_DIR/$LIBDIR/dbus-1/dbus-daemon-launch-helper
 
     # wpa_supplicant
     instbin $IMGPATH /usr/sbin/wpa_passphrase $MBD_DIR /usr/sbin/wpa_passphrase
@@ -949,8 +952,8 @@ makeinstimage () {
         echo "Running mkcramfs $CRAMBS $tmp $INSTIMGPATH/${imagename}2.img"
         mkfs.cramfs $CRAMBS $tmp $TMPDIR/${imagename}2.img.$$
     elif [ "$type" = "squashfs" ]; then
-        echo "Running mksquashfs $tmp $TMPDIR/${imagename}2.img -all-root -no-fragments -no-progress"
-        mksquashfs $tmp $TMPDIR/${imagename}2.img.$$ -all-root -no-fragments -no-progress
+        echo "Running mksquashfs $tmp $TMPDIR/${imagename}2.img -no-fragments -no-progress"
+        mksquashfs $tmp $TMPDIR/${imagename}2.img.$$ -no-fragments -no-progress
         chmod 0644 $TMPDIR/${imagename}2.img.$$
     fi
     cp $TMPDIR/${imagename}2.img.$$ $INSTIMGPATH/${imagename}2.img
@@ -995,8 +998,8 @@ makemainimage () {
         rmdir $mmi_mntpoint
     elif [ $type = "squashfs" ]; then
         makeproductfile $IMGPATH
-        echo "Running mksquashfs $IMGPATH $mmi_tmpimage -all-root -no-fragments -no-progress"
-        mksquashfs $IMGPATH $mmi_tmpimage -all-root -no-fragments -no-progress
+        echo "Running mksquashfs $IMGPATH $mmi_tmpimage -no-fragments -no-progress"
+        mksquashfs $IMGPATH $mmi_tmpimage -no-fragments -no-progress
         chmod 0644 $mmi_tmpimage
         SIZE=$(expr `cat $mmi_tmpimage | wc -c` / 1024)
     elif [ $type = "cramfs" ]; then
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 1d4af32..21565af 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -155,11 +155,11 @@ die () {
     exit 1
 }
 
-PACKAGES="GConf2 NetworkManager ORBit2 acl anaconda
+PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda
     anaconda-yum-plugins at-spi atk attr audit-libs bash bitmap-fonts-cjk
     btrfs-progs bzip2 bzip2-libs ca-certificates cairo cjkuni-uming-fonts
     comps-extras coreutils cpio cracklib cracklib-dicts cracklib-python
-    cryptsetup-luks cyrus-sasl-lib db4 dbus dbus-python dejavu-sans-fonts
+    cryptsetup-luks cyrus-sasl-lib db4 dbus dbus-x11 dbus-python dejavu-sans-fonts
     dcbd dejavu-sans-mono-fonts device-mapper device-mapper-libs
     device-mapper-multipath device-mapper-multipath-libs
     dhclient dmraid dmraid-libs
@@ -352,6 +352,7 @@ boot/efi/EFI/redhat/elilo.efi
 boot/efi/EFI/redhat/grub.efi
 boot/efika.forth
 boot/memtest86*
+etc/NetworkManager/VPN
 etc/NetworkManager/nm-system-settings.conf
 etc/NetworkManager/dispatcher.d
 etc/dbus-1/*
@@ -514,6 +515,7 @@ usr/bin/[
 usr/bin/Xorg
 usr/bin/Xvnc
 usr/bin/chattr*
+usr/bin/dbus-launch
 usr/bin/du
 usr/bin/expr
 usr/bin/gdb-gdbserver
@@ -535,6 +537,7 @@ usr/bin/maketilo
 usr/bin/md5sum
 usr/bin/mini-wm
 usr/bin/mkzimage
+usr/bin/nm-connection-editor
 usr/bin/pango*
 usr/bin/python
 usr/bin/python?.?
@@ -648,6 +651,8 @@ usr/share/hwdata/pci.ids
 usr/share/hwdata/usb.ids
 usr/share/hwdata/videoaliases
 usr/share/hwdata/videodrivers
+usr/share/icons/hicolor/*/apps/nm-*
+usr/share/icons/hicolor/index.theme
 usr/share/locale/*/LC_MESSAGES/anaconda.mo
 usr/share/locale/*/LC_MESSAGES/cracklib.mo
 usr/share/locale/*/LC_MESSAGES/gtk20.mo
@@ -658,6 +663,7 @@ usr/share/locale/*/LC_MESSAGES/system-config-date.mo
 usr/share/locale/*/LC_MESSAGES/system-config-keyboard.mo
 usr/share/locale/*/LC_MESSAGES/zenity.mo
 usr/share/locale/locale.alias
+usr/share/nm-applet/*
 usr/share/pixmaps/comps/*.png
 usr/share/pixmaps/gnome-default-dlg.png
 usr/share/pixmaps/gnome-error.png
-- 
1.6.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]