Anaconda-devel October 2009

anaconda-devel@lists.fedoraproject.org

29 participants
138 discussions

[PATCH] let stage2= honor NFS options by consolidating option parsing in loader
by Stijn Hoop 29 Oct '09

29 Oct '09

Hello, As requested by Radek Vykydal, please find attached my two updated patches for bug 529197 (stage2= does not honor NFS options). At the request of Chris Lumens I rewrote my earlier patch to consolidate the parsing code for NFS options. The first patch is against f12-branch d04d7f33, and is the one I tested, both with and without NFS options for both ks= and stage2= (well to be complete: I tested this against f12-branch from a few days ago, I only compile tested this rebased version). The second patch is against master 99dc7621, which I only compile tested since I do not know how to compose a bootable initrd.img with anaconda 13.xx. Happy to receive your commments, please CC me as I'm not subscribed, --Stijn

2 1

[PATCH parted 1/5] libparted: add ped_device_get_xxx_aligment() functions
by Hans de Goede 29 Oct '09

29 Oct '09

Add ped_device_get_minimal_aligment() and ped_device_get_optimal_aligment() functions to libparted. --- include/parted/device.h | 8 ++++++++ include/parted/natmath.h | 1 + libparted/device.c | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 0 deletions(-) diff --git a/include/parted/device.h b/include/parted/device.h index 151305f..31aec86 100644 --- a/include/parted/device.h +++ b/include/parted/device.h @@ -92,6 +92,8 @@ struct _PedDevice { void* arch_specific; }; +#include <parted/natmath.h> + /** * List of functions implementing architecture-specific operations. */ @@ -112,6 +114,9 @@ struct _PedDeviceArchOps { PedSector (*check) (PedDevice* dev, void* buffer, PedSector start, PedSector count); void (*probe_all) (); + /* These functions are optional */ + PedAlignment* (*get_minimal_aligment)(PedDevice* dev); + PedAlignment* (*get_optimal_aligment)(PedDevice* dev); }; #include <parted/constraint.h> @@ -141,6 +146,9 @@ extern PedSector ped_device_check (PedDevice* dev, void* buffer, PedSector start, PedSector count); extern PedConstraint* ped_device_get_constraint (PedDevice* dev); +extern PedAlignment* ped_device_get_minimal_aligment(PedDevice* dev); +extern PedAlignment* ped_device_get_optimal_aligment(PedDevice* dev); + /* private stuff ;-) */ extern void _ped_device_probe (const char* path); diff --git a/include/parted/natmath.h b/include/parted/natmath.h index cd7679d..eaa84d1 100644 --- a/include/parted/natmath.h +++ b/include/parted/natmath.h @@ -31,6 +31,7 @@ typedef struct _PedAlignment PedAlignment; #include <parted/disk.h> #include <parted/device.h> +#include <parted/geom.h> #define PED_MIN(a, b) ( ((a)<(b)) ? (a) : (b) ) #define PED_MAX(a, b) ( ((a)>(b)) ? (a) : (b) ) diff --git a/libparted/device.c b/libparted/device.c index 294fec4..6a41512 100644 --- a/libparted/device.c +++ b/libparted/device.c @@ -444,5 +444,23 @@ ped_device_get_constraint (PedDevice* dev) return c; } +PedAlignment* +ped_device_get_minimal_aligment(PedDevice* dev) +{ + if (ped_architecture->dev_ops->get_minimal_aligment) + return ped_architecture->dev_ops->get_minimal_aligment(dev); + + return NULL; /* ped_alignment_none */ +} + +PedAlignment* +ped_device_get_optimal_aligment(PedDevice* dev) +{ + if (ped_architecture->dev_ops->get_optimal_aligment) + return ped_architecture->dev_ops->get_optimal_aligment(dev); + + return NULL; /* ped_alignment_none */ +} + /** @} */ -- 1.6.5.1

2 10

[PATCH] DASD disklabels do not allow sector exact partitioning (#527104)
by Hans de Goede 28 Oct '09

28 Oct '09

--- storage/partitioning.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/storage/partitioning.py b/storage/partitioning.py index 1e2ee40..a5edd22 100644 --- a/storage/partitioning.py +++ b/storage/partitioning.py @@ -858,7 +858,11 @@ def allocatePartitions(disks, partitions): partition = parted.Partition(disk=disklabel.partedDisk, type=part_type, geometry=new_geom) - constraint = parted.Constraint(maxGeom=max_geom, minGeom=min_geom) + # DASD disklabels do not allow sector exact partitioning (#527104) + if _disk.type != 'dasd': + constraint = parted.Constraint(maxGeom=max_geom, minGeom=min_geom) + else: + constraint = disklabel.partedDevice.getConstraint() disklabel.partedDisk.addPartition(partition=partition, constraint=constraint) log.debug("created partition %s of %dMB and added it to %s" % -- 1.6.5.1

2 3

F11: re-installing on an LVM from Kickstart dies with 'name already in use'
by Martin Langhoff 28 Oct '09

28 Oct '09

I am seeing anaconda die with a kickstart that defines LVMs and partitions like this: clearpart --drives=sda bootloader --location=mbr part /boot --fstype ext3 --size=100 --ondisk=sda part / --fstype ext3 --size=2048 --maxsize=8192 --grow --ondisk=sda part pv.6 --size=1025 --grow --ondisk=sda volgroup VolGroup00 --pesize=32768 pv.6 logvol /library --fstype ext3 --name=LogVol00 --vgname=VolGroup00 --size=1 --grow logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=1024 --maxsize=2048 --grow The machine was installed with F9 (using this same ks), and now I want to test re-installing it. On F9 anaconda repartitions the hard drive, and installs the system anew. With F11, anaconda dies with (transcribed, partial backtrace as I cannot grab the logs): file /usr/lib/anaconda/kickstart.py - line 934 in parse peSize=vgd/pesize/1024.0) file /usr/lib/anaconda/storage/__init__.py line 616 in newVG raise ValueError("name already in use") Any ideas? cheers, m -- martin.langhoff(a)gmail.com martin(a)laptop.org -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff

2 2

Spaces in the 'family'?
by Martin Langhoff 28 Oct '09

28 Oct '09

Playing with F11 anaconda, there seems to be a regression in the handling of the 'family' string. In my iso, I have: $ head -n2 .treeinfo [general] family = OLPC School Server $ cat .discinfo 1256302801.615137 "OLPC School Server 0.7" i386 1 When anaconda starts, it talks about "OLPC" ('Welcome to OLPC fo i386') instead of "OLPC School Server". More worryingly, when invoking the text-mode installer there are broken characters "<94><F1><B7>" across the top of the screen. Any hints as to how to diagnose this further? cheers, m -- martin.langhoff(a)gmail.com martin(a)laptop.org -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff

1 0

[PATCH] Add sshd support for non-s390 platforms.
by Peter Jones 28 Oct '09

28 Oct '09

This leaves the sshd support on the s390 intact and functional (testing needed), and at the same time add the ability to ssh in and get a terminal on non-s390 platforms. --- anaconda | 26 ++++++++++++++++++ flags.py | 12 +++++--- loader/linuxrc.s390 | 2 +- scripts/mk-images | 72 ++++++++++++++++++++++++++++--------------------- scripts/upd-instroot | 24 +++++++++------- 5 files changed, 89 insertions(+), 47 deletions(-) diff --git a/anaconda b/anaconda index d1d2ba2..b774736 100755 --- a/anaconda +++ b/anaconda @@ -396,6 +396,30 @@ def setupGraphicalLinks(): except: pass +def createSshKey(algorithm, keyfile): + path = '/etc/ssh/%s' % (keyfile,) + argv = ['-q','-t',algorithm,'-f',path,'-C','','-N',''] + iutil.execWithRedirect('ssh-keygen', argv, searchPath=1) + +def startSsh(): + if not flags.sshd: + return + if iutil.isS390(): + return + + childpid = os.fork() + if not childpid: + ssh_keys = { + 'rsa1':'ssh_host_key', + 'rsa':'ssh_host_rsa_key', + 'dsa':'ssh_host_dsa_key', + } + for (algorithm, keyfile) in ssh_keys.items(): + createSshKey(algorithm, keyfile) + args = ["/sbin/sshd", "-f", "/etc/ssh/sshd_config.anaconda"] + os.execv("/sbin/sshd", args) + sys.exit(1) + class Anaconda: def __init__(self): self.intf = None @@ -573,6 +597,8 @@ if __name__ == "__main__": warnings.showwarning = AnacondaShowWarning + startSsh() + setupTranslations() # reset python's default SIGINT handler diff --git a/flags.py b/flags.py index ce77621..93472e3 100644 --- a/flags.py +++ b/flags.py @@ -86,17 +86,19 @@ class Flags: self.__dict__['flags']['cmdline'] = self.createCmdlineDict() self.__dict__['flags']['useIPv4'] = True self.__dict__['flags']['useIPv6'] = True + self.__dict__['flags']['sshd'] = 1 # for non-physical consoles like some ppc and sgi altix, # we need to preserve the console device and not try to # do things like bogl on them. this preserves what that # device is self.__dict__['flags']['virtpconsole'] = None - if self.__dict__['flags']['cmdline'].has_key("selinux"): - if self.__dict__['flags']['cmdline']["selinux"]: - self.__dict__['flags']['selinux'] = 1 - else: - self.__dict__['flags']['selinux'] = 0 + for x in ['selinux','sshd']: + if self.__dict__['flags']['cmdline'].has_key(x): + if self.__dict__['flags']['cmdline'][x]: + self.__dict__['flags'][x] = 1 + else: + self.__dict__['flags'][x] = 0 if self.__dict__['flags']['cmdline'].has_key("debug"): self.__dict__['flags']['debug'] = self.__dict__['flags']['cmdline']['debug'] diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390 index 854fdfb..3939371 100644 --- a/loader/linuxrc.s390 +++ b/loader/linuxrc.s390 @@ -126,7 +126,7 @@ function startinetd() echo >> /etc/motd fi # testing - /sbin/sshd + /sbin/sshd -f /etc/sshd_config.anaconda if [ -z "$RUNKS" ]; then echo echo $"Connect now to $IPADDR and log in as user install to start the installation." diff --git a/scripts/mk-images b/scripts/mk-images index 44e4664..214da16 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -406,7 +406,9 @@ instbin() { } setupShellEnvironment() { - echo "tcp 6 TCP" > $MBD_DIR/etc/protocols + cp -f $IMGPATH/etc/protocols $MBD_DIR/etc/protocols + echo "sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin" \ + >> $MBD_DIR/etc/passwd # enable root shell logins echo "root::14438:0:99999:7:::" >> $MBD_DIR/etc/shadow @@ -439,26 +441,29 @@ EOF cp -f $IMGPATH/etc/security/{limits.conf,pam_env.conf} $MBD_DIR/etc/security/ - # key generation takes ages on s390, you really don't want this for every - # installation attempt. These are NOT the keys of the installed system! mkdir -m 0700 -p $MBD_DIR/etc/ssh - echo -n "Generating SSH1 RSA host key: " - /usr/bin/ssh-keygen -q -t rsa1 -f $MBD_DIR/etc/ssh/ssh_host_key \ - -C '' -N '' >&/dev/null - echo - echo -n "Generating SSH2 RSA host key: " - /usr/bin/ssh-keygen -q -t rsa -f $MBD_DIR/etc/ssh/ssh_host_rsa_key \ - -C '' -N '' >&/dev/null - echo - echo -n "Generating SSH2 DSA host key: " - /usr/bin/ssh-keygen -q -t dsa -f $MBD_DIR/etc/ssh/ssh_host_dsa_key \ - -C '' -N '' >&/dev/null - echo - (cd $MBD_DIR/etc/ssh; \ - chmod 600 ssh_host_key ssh_host_rsa_key ssh_host_dsa_key; \ - chmod 644 ssh_host_key.pub ssh_host_rsa_key.pub ssh_host_dsa_key.pub; ) - - cat > $MBD_DIR/etc/ssh/sshd_config <<EOF + if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then + # key generation takes ages on s390, you really don't want this + # for every installation attempt. These are NOT the keys of the + # installed system! + echo -n "Generating SSH1 RSA host key: " + /usr/bin/ssh-keygen -q -t rsa1 -f $MBD_DIR/etc/ssh/ssh_host_key \ + -C '' -N '' >&/dev/null + echo + echo -n "Generating SSH2 RSA host key: " + /usr/bin/ssh-keygen -q -t rsa -f $MBD_DIR/etc/ssh/ssh_host_rsa_key \ + -C '' -N '' >&/dev/null + echo + echo -n "Generating SSH2 DSA host key: " + /usr/bin/ssh-keygen -q -t dsa -f $MBD_DIR/etc/ssh/ssh_host_dsa_key \ + -C '' -N '' >&/dev/null + echo + (cd $MBD_DIR/etc/ssh; \ + chmod 600 ssh_host_key ssh_host_rsa_key ssh_host_dsa_key; \ + chmod 644 ssh_host_key.pub ssh_host_rsa_key.pub ssh_host_dsa_key.pub; ) + fi + + cat > $MBD_DIR/etc/ssh/sshd_config.anaconda <<EOF Port 22 HostKey /etc/ssh/ssh_host_key HostKey /etc/ssh/ssh_host_rsa_key @@ -477,11 +482,13 @@ PasswordAuthentication yes PermitEmptyPasswords yes PermitUserEnvironment yes EOF - chmod 600 $MBD_DIR/etc/ssh/sshd_config + chmod 600 $MBD_DIR/etc/ssh/sshd_config.anaconda # copy in the binaries - instbin $IMGPATH /usr/bin/login $MBD_DIR /sbin/login + instbin $IMGPATH /sbin/nologin $MBD_DIR /sbin/nologin + instbin $IMGPATH /bin/login $MBD_DIR /sbin/login instbin $IMGPATH /usr/sbin/sshd $MBD_DIR /sbin/sshd + instbin $IMGPATH /usr/bin/ssh-keygen $MBD_DIR /sbin/ssh-keygen } @@ -573,13 +580,19 @@ makeinitrd() { mkdir -p $MBD_DIR/etc/rc.d/init.d mkdir -p $MBD_DIR/usr/sbin mkdir -p $MBD_DIR/var/run/wpa_supplicant + mkdir -m 111 -p $MBD_DIR/var/empty/sshd + mkdir -p $MBD_DIR/etc/{pam.d,security} + mkdir -p $MBD_DIR/$LIBDIR/security + + for x in $IMGPATH/$LIBDIR/security/* ; do + y=$(basename $x) + instbin $IMGPATH $LIBDIR/security/$y $MBD_DIR $LIBDIR/security/$y + done + + cp $IMGPATH/$LIBDIR/libpam_misc.so.0.* $MBD_DIR/$LIBDIR/libpam_misc.so.0 + cp $IMGPATH/$LIBDIR/libwrap*.so* $MBD_DIR/$LIBDIR/ if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then - mkdir -m 111 -p $MBD_DIR/var/empty/sshd - mkdir -p $MBD_DIR/etc/{pam.d,security} - mkdir -p $MBD_DIR/$LIBDIR/security - cp $IMGPATH/$LIBDIR/libpam_misc.so.0.* $MBD_DIR/$LIBDIR/libpam_misc.so.0 - cp $IMGPATH/$LIBDIR/libwrap*.so* $MBD_DIR/$LIBDIR/ ln -s /tmp $MBD_DIR/var/state/xkb instbin $IMGPATH /usr/bin/xauth $MBD_DIR /sbin/xauth local cmsfsbin cmd @@ -821,10 +834,7 @@ makeinitrd() { mkdir -p $MBD_DIR/var/lib ln -s ../../tmp $MBD_DIR/var/lib/xkb - # s390/s390x need sshd setup - if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then - setupShellEnvironment - fi + setupShellEnvironment cat > $MBD_DIR/.profile <<EOF PS1="[anaconda \u@\h \W]\\\\$ " diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 64017d1..a9b4058 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -181,7 +181,9 @@ PACKAGES="GConf2 NetworkManager ORBit2 acl anaconda lohit-oriya-fonts lohit-punjabi-fonts lohit-sindhi-fonts lohit-tamil-fonts lohit-telugu-fonts lvm2 madan-fonts mdadm mesa-dri-drivers mkinitrd module-init-tools nash ncurses neon net-tools - newt newt-python nfs-utils nspr nss nss-softokn ntfs-3g openldap pam pango parted pciutils pcre + newt newt-python nfs-utils nspr nss nss-softokn ntfs-3g + openldap openssh openssh-server + pam pango parted pciutils pcre pygtk2-libglade pykickstart pyparted python python-bugzilla python-decorator python-libs python-nss python-pyblock python-sqlite python-urlgrabber python-volume_key pyxf86config readline redhat-artwork @@ -222,7 +224,7 @@ fi if [ $ARCH = s390 -o $ARCH = s390x ]; then PACKAGES="$PACKAGES bind-utils binutils coreutils findutils gzip initscripts iputils less libgcc login lsscsi modutils mount - net-tools openssh openssh-clients openssh-server pam portmap + net-tools openssh-clients pam portmap s390utils sed strace tar tcp_wrappers xorg-x11-libs xorg-x11-xauth" fi @@ -283,6 +285,8 @@ $LIBDIR/bdevid $LIBDIR/dbus-1 $LIBDIR/libnss_dns* $LIBDIR/libnss_files* +$LIBDIR/libwrap*.so* +$LIBDIR/security/pam_* bin/arch bin/basename bin/bash @@ -310,6 +314,7 @@ bin/hostname bin/ipcalc bin/kill bin/ln +bin/login bin/ls bin/mkdir bin/mknod @@ -353,6 +358,8 @@ etc/iscsid.conf etc/man.config etc/mke2fs.conf etc/nsswitch.conf +etc/pam.d/other +etc/pam.d/sshd etc/pango etc/passwd etc/pcmcia @@ -363,6 +370,8 @@ etc/prelink.conf etc/protocols etc/rc.d/init.d/functions etc/rpm/macros.prelink +etc/security/limits.conf +etc/security/pam_env.conf etc/selinux/targeted etc/services etc/shells @@ -430,6 +439,7 @@ sbin/mkreiserfs sbin/mkswap sbin/mount.nfs* sbin/mount.ntfs* +sbin/nologin sbin/ofpath sbin/parted sbin/pcmcia-socket-startup @@ -511,6 +521,7 @@ usr/bin/reduce-font usr/bin/setxkbmap usr/bin/sha1sum usr/bin/split +usr/bin/ssh-keygen usr/bin/syslinux usr/bin/tac usr/bin/tail @@ -567,6 +578,7 @@ usr/sbin/prelink usr/sbin/semodule usr/sbin/showpart usr/sbin/smartctl +usr/sbin/sshd usr/sbin/wpa_passphrase usr/sbin/wpa_supplicant usr/sbin/wrapper @@ -660,7 +672,6 @@ bin/dmesg bin/echo bin/find bin/gzip -bin/login bin/ls bin/mknod bin/ping @@ -670,12 +681,6 @@ bin/sort bin/tar bin/uname bin/vi -etc/pam.d/other -etc/pam.d/sshd -etc/security/limits.conf -etc/security/pam_env.conf -$LIBDIR/libwrap*.so* -$LIBDIR/security/pam_* lib/modules/ibm lib/security sbin/arp @@ -711,7 +716,6 @@ usr/bin/tr usr/bin/wc usr/bin/xauth usr/sbin/glibc_post_upgrade -usr/sbin/sshd usr/share/terminfo/a/ansi usr/share/terminfo/d/dumb usr/share/terminfo/k/kterm -- 1.6.5.rc2

3 4

[rhel6-branch] & [master] format unformatted DASDs (#528386)
by David Cantrell 28 Oct '09

28 Oct '09

These patches are intended for rhel6-branch and master. Bug #528386 is meant to improve the dasdfmt support we had from RHEL-5. I have divided the work in to two parts: 1) Functional. Detect unformatted DASDs, offer the user to option to format them or bail, perform the format and display progress. 2) Parallel formatting. IBM wants parallel formatting support for sites that have thousands of DASDs. I wanted to separate that work from these patches. I changed execWithPulseProgress() in iutil.py to execWithCallback(). The execWithPulseProgress() function is now implemented using execWithCallback. You can see how I use execWithCallback in the new dasd.py for displaying progress as captured from the dasdfmt command. I did introduce storage/dasd.py, which brings in a DASD class. The whole dasdfmt operation needs to occur before we initialize the storage code in anaconda. So like we have the iscsi and ZFCP classes and call startup() on those before initializing the storage code, that's what the DASD class is meant to do. It also leaves a convenient place for future DASD patches that need to deal with system-wide configuration files such as a possible /etc/dasd.conf or something like that. Lastly, compared to RHEL-5, the dasdfmt question is asked once. We used to present a Yes/Skip dialog for each unformatted DASD, which is simply unusable. I now build a list of all unformatted DASDs and tell the user how many were found and ask if you want them formatted. I did kick around the idea of presenting a checklist where users could uncheck DASDs they did not want anaconda to format and use, but really, we give users plenty of ways to skip or mask out devices with all of the linuxrc.s390 stuff, I felt doing it here was pointless. By the time anaconda runs, we should be able to use all of the DASDs we see. The next patch set will be for the parallel formatting with dasdfmt. Progress bar code in this set has been tested on both the iw and textw code. Works fine on both. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

4 15

Invitation to connect on LinkedIn
by Nitesh Jain 28 Oct '09

28 Oct '09

LinkedIn ------------ I'd like to add you to my professional network on LinkedIn. - Nitesh Confirm that you know Nitesh Jain https://www.linkedin.com/e/isd/825083332/q6T7LTWn/ Every day, millions of professionals like Nitesh Jain use LinkedIn to connect with colleagues, find experts, and explore opportunities. ------ (c) 2009, LinkedIn Corporation

1 0

[PATCH 1/2] Rename platform.diskType to platform.diskLabelType
by Hans de Goede 27 Oct '09

27 Oct '09

Rename platform.diskType to platform.diskLabelType, as diskType is confusing (we usally use it to refer to is the disk dasd, iscsi, zfcp, etc.). --- platform.py | 30 +++++++++++++++--------------- storage/formats/disklabel.py | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/platform.py b/platform.py index d279c18..66e222c 100644 --- a/platform.py +++ b/platform.py @@ -39,7 +39,7 @@ class Platform(object): architecture quirks in one place to avoid lots of platform checks throughout anaconda.""" _bootFSTypes = ["ext3"] - _diskType = parted.diskType["msdos"] + _diskLabelType = parted.diskType["msdos"] _isEfi = iutil.isEfi() _minimumSector = 0 _packages = [] @@ -140,14 +140,14 @@ class Platform(object): return errors @property - def diskType(self): + def diskLabelType(self): """Return the disk label type as a parted.DiskType.""" - return self._diskType + return self._diskLabelType - @diskType.setter - def diskType(self, value): + @diskLabelType.setter + def diskLabelType(self, value): """Sets the disk label type.""" - self._diskType = value + self._diskLabelType = value @property def isEfi(self): @@ -198,7 +198,7 @@ class Platform(object): class EFI(Platform): _bootFSTypes = ["ext4", "ext3", "ext2"] - _diskType = parted.diskType["gpt"] + _diskLabelType = parted.diskType["gpt"] _minBootPartSize = 50 _maxBootPartSize = 256 @@ -249,7 +249,7 @@ class EFI(Platform): return 0 class Alpha(Platform): - _diskType = parted.diskType["bsd"] + _diskLabelType = parted.diskType["bsd"] def checkBootRequest(self, req): errors = Platform.checkBootRequest(self, req) @@ -260,7 +260,7 @@ class Alpha(Platform): disk = req.disk.format.partedDisk # Check that we're a BSD disk label - if not disk.type == self.diskType.name: + if not disk.type == self.diskLabelType.name: errors.append(_("%s must have a bsd disk label.") % req.disk.name) # The first free space should start at the beginning of the drive and @@ -361,7 +361,7 @@ class IPSeriesPPC(PPC): return 0 class NewWorldPPC(PPC): - _diskType = parted.diskType["mac"] + _diskLabelType = parted.diskType["mac"] _minBootPartSize = (800.00 / 1024.00) _maxBootPartSize = 1 @@ -403,7 +403,7 @@ class NewWorldPPC(PPC): disk = req.disk.format.partedDisk # Check that we're a Mac disk label - if not disk.type == self.diskType.name: + if not disk.type == self.diskLabelType.name: errors.append(_("%s must have a mac disk label.") % req.disk.name) # All of the above just checks the appleboot partitions. We still @@ -433,7 +433,7 @@ class NewWorldPPC(PPC): return 0 class PS3(PPC): - _diskType = parted.diskType["msdos"] + _diskLabelType = parted.diskType["msdos"] def __init__(self, anaconda): PPC.__init__(self, anaconda) @@ -445,7 +445,7 @@ class S390(Platform): Platform.__init__(self, anaconda) class Sparc(Platform): - _diskType = parted.diskType["sun"] + _diskLabelType = parted.diskType["sun"] @property def minimumSector(self, disk): @@ -463,9 +463,9 @@ class X86(EFI): EFI.__init__(self, anaconda) if self.isEfi: - self.diskType = parted.diskType["gpt"] + self.diskLabelType = parted.diskType["gpt"] else: - self.diskType = parted.diskType["msdos"] + self.diskLabelType = parted.diskType["msdos"] def bootDevice(self): if self.isEfi: diff --git a/storage/formats/disklabel.py b/storage/formats/disklabel.py index 9d07d31..a6e3352 100644 --- a/storage/formats/disklabel.py +++ b/storage/formats/disklabel.py @@ -92,7 +92,7 @@ class DiskLabel(DeviceFormat): def freshPartedDisk(self): """ Return a new, empty parted.Disk instance for this device. """ log_method_call(self, device=self.device) - labelType = platform.getPlatform(None).diskType + labelType = platform.getPlatform(None).diskLabelType return parted.freshDisk(device=self.partedDevice, ty=labelType) @property -- 1.6.5.1

2 2

Installations and mirror lists
by john maclean 27 Oct '09

27 Oct '09

Hey Chaps, I've often wondered why anaconda does not have a list of mirrors to install from, particularly during network-based installations. I've seen this work flawlessly with *ahem* another distro. Any particular reason why a small list of stable mirrors can't be included? Please do tell me if this is the wrong list to ask this question. If you are looking for a tester, lemme know ;-) -- John Maclean 07739 171 531 MSc (DIC) Timezone: GMT

2 3

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel October 2009