diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | anaconda | 18 | ||||
| -rw-r--r-- | anaconda.spec.in | 4 | ||||
| -rw-r--r-- | loader/loader.c | 2 |
4 files changed, 9 insertions, 18 deletions
@@ -55,7 +55,7 @@ install-reconfig: all mkdir -p $(RECFGDESTDIR)/$(PYTHONLIBDIR) cp -a reconfig.init $(RECFGDESTDIR)/etc/rc.d/init.d/reconfig - cp -a anaconda $(RECFGDESTDIR)/usr/sbin/anaconda-reconfig + cp -a anaconda $(RECFGDESTDIR)/usr/sbin/anaconda cp -var $(PYFILES) $(RECFGDESTDIR)/$(PYTHONLIBDIR) ./py-compile --basedir $(RECFGDESTDIR)/$(PYTHONLIBDIR) $(PYFILES) cp -a *.so $(RECFGDESTDIR)/$(PYTHONLIBDIR) @@ -94,6 +94,7 @@ create-archive: @rm -rf /tmp/anaconda-$(VERSION) @echo "WARNING WARNING WARNING: Pulling HEAD off - need to do tagging instead!" @cd /tmp ; cvs -Q -d $(CVSROOT) export -r HEAD anaconda || echo "Um... export aborted." + @cd /tmp/anaconda ; rm isys/modutils/modutils.spec; rm pump/pump.spec @cd /tmp/anaconda ; sed -e "s/@@VERSION@@/$(VERSION)/g" < anaconda.spec.in > anaconda.spec @mv /tmp/anaconda /tmp/anaconda-$(VERSION) @cd /tmp ; tar -czSpf anaconda-$(VERSION).tar.gz anaconda-$(VERSION) @@ -32,8 +32,8 @@ gettext.bindtextdomain("anaconda", "/usr/share/locale") gettext.textdomain("anaconda") _ = gettext.gettext -(args, extra) = isys.getopt(sys.argv[1:], 'GITRtdr:fm:', - [ 'gui', 'install', 'text', 'reconfig', 'test', 'debug', +(args, extra) = isys.getopt(sys.argv[1:], 'GTRtdr:fm:', + [ 'gui', 'text', 'reconfig', 'test', 'debug', 'method=', 'rootpath=', 'testpath=', 'mountfs', 'traceonly', 'kickstart=', 'lang=', 'keymap=', 'kbdtype=', 'module=', @@ -102,9 +102,6 @@ for n in args: if (str == '-G' or str == '--gui'): display_mode = 'g' - elif (str == '-I' or str == '--install'): - reconfigOnly = 0 - progmode = 'install' elif (str == '-T' or str == '--text'): display_mode = 't' elif (str == '-R' or str == '--reconfig'): @@ -117,6 +114,8 @@ for n in args: extraModules.append((path, subdir, name)) elif (str == '-m' or str == '--method'): method = arg + reconfigOnly = 0 + progmode = 'install' elif (str == '-d' or str == '--debug'): debug = 1 elif (str == '--kickstart'): @@ -139,19 +138,12 @@ for n in args: keymap = arg elif (str == '--kbdtype'): kbdtype = arg -# -# see how we were run, override command line mode selection -# -if (execname == "anaconda-reconfig"): - print "overriding to reconfig mode based on script name" - reconfigOnly = 1 - # # must specify install or reconfig mode # if (progmode == None) - print "Must specify either --reconfig or --install for program mode" + print "Must specify either --reconfig or --method for program mode" sys.exit(1) # diff --git a/anaconda.spec.in b/anaconda.spec.in index ec8c10b83..dc1e49033 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -1,11 +1,11 @@ Name: anaconda Version: @@VERSION@@ -Release: 5 +Release: 6 Copyright: GPL Summary: The Red Hat Linux first time booting configuration tool. Group: Applications/System Source: anaconda-%{PACKAGE_VERSION}.tar.gz -Obsoletes: rhs-hwdiag setconsole +Obsoletes: anaconda-reconfig Prereq: chkconfig BuildRoot: /var/tmp/anaconda-%{PACKAGE_VERSION} diff --git a/loader/loader.c b/loader/loader.c index a3666fd78..c24ae9ceb 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2047,8 +2047,6 @@ int main(int argc, char ** argv) { *argptr++ = "-m"; *argptr++ = url; - *argptr++ = "--install"; - if (FL_SERIAL(flags)) *argptr++ = "--serial"; if (FL_TEXT(flags)) |