diff options
| author | Jeremy Katz <katzj@redhat.com> | 2008-09-16 14:06:33 -0400 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2008-09-29 10:35:56 -0400 |
| commit | da459689b78a80108916f58ea467db55026b14a1 (patch) | |
| tree | a3c1584c3e15c9a1673979a81430fcf42e4fc801 | |
| parent | 254097107fc71b1e5ce22c86e89cce6d492d8322 (diff) | |
| download | anaconda-da459689b78a80108916f58ea467db55026b14a1.tar.gz anaconda-da459689b78a80108916f58ea467db55026b14a1.tar.xz anaconda-da459689b78a80108916f58ea467db55026b14a1.zip | |
Support installs to SD via MMC (#461884)
Add modules for sd/mmc subsystem and support the block device name where we
need to do munging given the 'p' separator
| -rw-r--r-- | fsset.py | 2 | ||||
| -rw-r--r-- | partedUtils.py | 3 | ||||
| -rwxr-xr-x | scripts/mk-images | 3 |
3 files changed, 5 insertions, 3 deletions
@@ -2978,7 +2978,7 @@ def getDiskPart(dev): cut = len(dev) if (dev.startswith('rd/') or dev.startswith('ida/') or dev.startswith('cciss/') or dev.startswith('sx8/') or - dev.startswith('mapper/')): + dev.startswith('mapper/') or dev.startswith('mmcblk')): if dev[-2] == 'p': cut = -1 elif dev[-3] == 'p': diff --git a/partedUtils.py b/partedUtils.py index c23599be8..394d4158d 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -159,7 +159,7 @@ def get_partition_name(partition): drive = partition.geom.dev.path[5:] if (drive.startswith("cciss") or drive.startswith("ida") or drive.startswith("rd") or drive.startswith("sx8") or - drive.startswith("mapper")): + drive.startswith("mapper") or drive.startswith("mmcblk")): sep = "p" else: sep = "" @@ -1449,4 +1449,5 @@ max_logical_partition_count = { "sx8/": 11, "xvd": 11, "vd": 11, + "mmcblk": 5 } diff --git a/scripts/mk-images b/scripts/mk-images index 7164ad6cb..1eb9529ba 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -109,6 +109,7 @@ TOPDIR=$(cd $TOPDIR; pwd) COMMONMODS="fat vfat nfs sunrpc lockd floppy cramfs loop edd pcspkr squashfs ipv6 virtio_pci" USBMODS="ohci-hcd uhci-hcd ehci-hcd hid mousedev usb-storage sd_mod sr_mod ub appletouch" FIREWIREMODS="ohci1394 sbp2 fw-ohci fw-sbp2 firewire-sbp2 firewire-ohci" +SDMODS="mmc-block sdhci sdhci-pci" IDEMODS="ide-cd ide-cd_mod" SCSIMODS="sr_mod sg st sd_mod scsi_mod iscsi_tcp iscsi_ibft" FSMODS="fat msdos vfat ext2 ext3 ext4dev reiserfs jfs xfs gfs2 cifs" @@ -117,7 +118,7 @@ RAIDMODS="raid0 raid1 raid5 raid6 raid456 raid10 linear" CRYPTOMODS="sha256_generic cbc xts lrw aes_generic crypto_blkcipher crc32c ecb arc4" PCMCIASOCKMODS="yenta_socket i82365 tcic pcmcia" DRMMODS="drm i810 i830 i915 mga nouveau r128 radeon savage sis tdfx via" -INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS $DRMMODS =scsi =net" +INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS $DRMMODS $SDMODS =scsi =net" . $(dirname $0)/buildinstall.functions |