Attachment 160456 Details for Bug 250301 – better patch, best of both worlds, initial testing suggests it works

[patch] better patch, best of both worlds, initial testing suggests it works

anaconda.liveinst_mustformatroot.patch (text/plain), 3.42 KB, created by Jane Dogalt on 2007-08-01 19:24:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jane Dogalt

Created: 2007-08-01 19:24:23 UTC

Size: 3.42 KB

patch

obsolete

>diff -Naur anaconda.cvs.20070801c/ChangeLog anaconda/ChangeLog
>--- anaconda.cvs.20070801c/ChangeLog	2007-08-01 14:56:25.000000000 +0000
>+++ anaconda/ChangeLog	2007-08-01 18:52:51.000000000 +0000
>@@ -1,5 +1,14 @@
> 2007-08-01  Chris Lumens  <clumens@redhat.com>
> 
>+	From Douglas McClendont <douglas AT mcclendon DOT org> (#250301)
>+	* partRequests.py (RequestSpec.doMountPointLinuxFSChecks):  Certain
>+	filesystems must be formatted on live CD installs (#250301). fixes.
>+	* flags.py: added liveinst commandline flag
>+	* liveinst.sh: added liveinst commandline flag
>+	* anaconda: added liveinst commandline flag
>+
>+2007-08-01  Chris Lumens  <clumens@redhat.com>
>+
> 	* partRequests.py (RequestSpec.doMountPointLinuxFSChecks):  Certain
> 	filesystems must be formatted on live CD installs (#250301).
> 
>diff -Naur anaconda.cvs.20070801c/anaconda anaconda/anaconda
>--- anaconda.cvs.20070801c/anaconda	2007-07-30 15:43:31.000000000 +0000
>+++ anaconda/anaconda	2007-08-01 19:02:32.000000000 +0000
>@@ -204,6 +204,7 @@
>                   default="/mnt/sysimage", nargs=1, type="string")
>     op.add_option("-t", "--test", action="store_true", default=False)
>     op.add_option("--targetarch", dest="targetArch", nargs=1, type="string")
>+    op.add_option("--liveinst", action="store_true", default=False)
>                   
>     # Display
>     op.add_option("--headless", dest="isHeadless", action="store_true", default=False)
>@@ -602,6 +603,9 @@
>     if opts.noipv6:
>         flags.useIPv6 = False
> 
>+    if opts.liveinst:
>+        flags.liveinst = True
>+
>     if opts.updateSrc:
>         anaconda.updateSrc = opts.updateSrc
> 
>diff -Naur anaconda.cvs.20070801c/flags.py anaconda/flags.py
>--- anaconda.cvs.20070801c/flags.py	2006-10-18 21:33:24.000000000 +0000
>+++ anaconda/flags.py	2007-08-01 18:28:21.000000000 +0000
>@@ -51,6 +51,7 @@
> 	self.__dict__['flags']['test'] = 0
> 	self.__dict__['flags']['rootpath'] = 0
> 	self.__dict__['flags']['livecd'] = 0        
>+	self.__dict__['flags']['liveinst'] = 0        
> 	self.__dict__['flags']['expert'] = 0
> 	self.__dict__['flags']['iscsi'] = 0
> 	self.__dict__['flags']['serial'] = 0
>diff -Naur anaconda.cvs.20070801c/liveinst/liveinst.sh anaconda/liveinst/liveinst.sh
>--- anaconda.cvs.20070801c/liveinst/liveinst.sh	2007-04-04 18:05:42.000000000 +0000
>+++ anaconda/liveinst/liveinst.sh	2007-08-01 18:28:43.000000000 +0000
>@@ -26,7 +26,7 @@
> fi
> 
> # eventually, we might want to allow a more "normal" install path
>-ANACONDA="/usr/sbin/anaconda --method=livecd://$LIVE_BLOCK --lang $LANG"
>+ANACONDA="/usr/sbin/anaconda --liveinst --method=livecd://$LIVE_BLOCK --lang $LANG"
> 
> if [ -x /usr/sbin/setenforce -a -e /selinux/enforce ]; then
>     current=$(cat /selinux/enforce)
>diff -Naur anaconda.cvs.20070801c/partRequests.py anaconda/partRequests.py
>--- anaconda.cvs.20070801c/partRequests.py	2007-08-01 14:56:25.000000000 +0000
>+++ anaconda/partRequests.py	2007-08-01 18:29:34.000000000 +0000
>@@ -23,7 +23,7 @@
> import os, sys, math
> 
> from constants import *
>-from flags import *
>+from flags import flags
> from rhpl.translate import _
> 
> import fsset
>@@ -255,7 +255,7 @@
> 			 "operation.  Please select a different "
> 			 "mount point.") % (self.mountpoint,)
> 
>-            if flags.livecd and self.mountpoint in mustbeonlinuxfs and not self.format:
>+            if flags.liveinst and self.mountpoint == "/" and not self.format:
>                 return _("The mount point %s must be formatted on live CD "
>                          "installs.") % (self.mountpoint,)
>

Actions: View | Diff

Attachments on bug 250301: 160404 | 160456