This is required to allow updates images to continue working in a world
where anaconda is its own python module. Since anaconda's just like any
other module now, updating part of it will require making an anaconda/
directory in the updates image. However, this means you can't also update
the anaconda binary at the same time because of the name collision.
---
Makefile.am | 2 +-
anaconda => anaconda-bin | 0
anaconda.spec.in | 2 +-
liveinst/liveinst | 2 +-
loader/loader.c | 2 +-
po/POTFILES.in | 2 +-
scripts/upd-instroot | 4 ++--
7 files changed, 7 insertions(+), 7 deletions(-)
rename anaconda => anaconda-bin (100%)
diff --git a/Makefile.am b/Makefile.am
index 94a1297..eff1aa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ MOSTLYCLEANDIRS = m4
dist_noinst_DATA = $(PACKAGE_NAME).spec
-dist_sbin_SCRIPTS = anaconda
+dist_sbin_SCRIPTS = anaconda-bin
udevdir = /lib/udev/rules.d
dist_udev_DATA = 70-anaconda.rules
diff --git a/anaconda b/anaconda-bin
similarity index 100%
rename from anaconda
rename to anaconda-bin
diff --git a/anaconda.spec.in b/anaconda.spec.in
index b48ebf7..f1c792c 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -201,7 +201,7 @@ update-desktop-database &> /dev/null || :
%doc docs/mediacheck.txt
%doc docs/anaconda-release-notes.txt
/lib/udev/rules.d/70-anaconda.rules
-%{_sbindir}/anaconda
+%{_sbindir}/anaconda-bin
%ifarch i386 i486 i586 i686 x86_64
%{_sbindir}/gptsync
%{_sbindir}/showpart
diff --git a/liveinst/liveinst b/liveinst/liveinst
index 51eae2f..a97e543 100755
--- a/liveinst/liveinst
+++ b/liveinst/liveinst
@@ -45,7 +45,7 @@ if [ -n "$DISPLAY" -a -n "$LANG" ]; then
fi
# eventually, we might want to allow a more "normal" install path
-ANACONDA="/usr/sbin/anaconda --liveinst --method=livecd://$LIVE_BLOCK $INSTLANG"
+ANACONDA="/usr/sbin/anaconda-bin --liveinst --method=livecd://$LIVE_BLOCK $INSTLANG"
if [ -x /usr/sbin/setenforce -a -e /selinux/enforce ]; then
current=$(cat /selinux/enforce)
diff --git a/loader/loader.c b/loader/loader.c
index da66f36..4343626 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -2181,7 +2181,7 @@ int main(int argc, char ** argv) {
c = path[n];
path[n] = '\0';
- checked_asprintf(&binpath, "%s/anaconda", path);
+ checked_asprintf(&binpath, "%s/anaconda-bin", path);
path[n] = c;
if (!access(binpath, X_OK)) {
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0952592..057cb8f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
# Copyright (C) 2009 Red Hat, Inc.
# Main anaconda source files
-anaconda
+anaconda-bin
backend.py
bootloader.py
cmdline.py
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 817996e..607165d 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -591,7 +591,7 @@ usr/libexec/nm-dispatcher.action
usr/libexec/polkit*
usr/sbin/NetworkManager
usr/sbin/addRamDisk
-usr/sbin/anaconda
+usr/sbin/anaconda-bin
usr/sbin/chroot
usr/sbin/dcbtool
usr/sbin/ddcprobe
@@ -1028,7 +1028,7 @@ cp $DEST/usr/lib/anaconda/losetup-stub $DEST/usr/bin/losetup
cp $DEST/usr/lib/anaconda/list-harddrives-stub $DEST/usr/bin/list-harddrives
cp $DEST/usr/lib/anaconda/loadkeys-stub $DEST/usr/bin/loadkeys
cp $DEST/usr/lib/anaconda/mknod-stub $DEST/usr/bin/mknod
-mv $DEST/usr/sbin/anaconda $DEST/usr/bin/anaconda
+mv $DEST/usr/sbin/anaconda-bin $DEST/usr/bin/anaconda-bin
mv $DEST/usr/$LIBDIR/python?.?/site-packages/anaconda/sitecustomize.py $DEST/usr/$LIBDIR/python?.?/site-packages
mv $DEST/etc/yum.repos.d $DEST/etc/anaconda.repos.d
--
1.6.5.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
