summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2009-01-12 15:19:12 -0600
committerJeremy Katz <katzj@redhat.com>2009-01-19 13:38:06 -0500
commit198bf1b216f78bb2bdc09c5622aa9ab7f076ddc8 (patch)
treea87c67c6f987135b9901b6f092e649b399675f86 /scripts
parentd6c57672439d9393d06dfb20870fd6429d749d95 (diff)
btrfs install support
Now that btrfs is in mainline, let's let anaconda play with it too ;) We still need btrfs.ko in the kernel, and btrfs support in e2fsprogs. I've got the latter patch submitted upstream, and it's in rawhide now. Note that the below is 100% totally untested and may even have typos, my track record with python is not too good, sorry. :) So review would be appreciated.... Updated to address Radek's review, as well as adding the requisite witty (commandline-space-eating) boot option... (And stopped trying to use parted fs identification -- katzj) Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mk-images2
-rwxr-xr-xscripts/upd-instroot5
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/mk-images b/scripts/mk-images
index 401c15a91..d745c7f58 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -112,7 +112,7 @@ 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 ext4 reiserfs jfs xfs gfs2 cifs fuse"
+FSMODS="fat msdos vfat ext2 ext3 ext4 reiserfs jfs xfs gfs2 cifs fuse btrfs"
LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-crypt"
RAIDMODS="raid0 raid1 raid5 raid6 raid456 raid10 linear"
CRYPTOMODS="sha256_generic cbc xts lrw aes_generic crypto_blkcipher crc32c ecb arc4"
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index f0edce841..ae37ab64f 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -150,7 +150,7 @@ die () {
PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit VLGothic-fonts acl anaconda
anaconda-yum-plugins at-spi atk attr audit-libs bash bitmap-fonts-cjk
- booty busybox-anaconda bzip2 bzip2-libs cairo cjkunifonts-uming
+ booty btrfs-progs busybox-anaconda bzip2 bzip2-libs cairo cjkunifonts-uming
comps-extras coreutils cpio cracklib cracklib-dicts cracklib-python
cryptsetup-luks db4 dbus dbus-python dejavu-sans-fonts
dejavu-sans-mono-fonts device-mapper
@@ -345,6 +345,8 @@ lib/udev
sbin/*gfs*
sbin/arping
sbin/badblocks
+sbin/btrfsctl
+sbin/btrfsck
sbin/busybox.anaconda
sbin/clock
sbin/consoletype
@@ -379,6 +381,7 @@ sbin/lvm*
sbin/mdadm
sbin/mkdosfs
sbin/mke2fs
+sbin/mkfs.btrfs
sbin/mkfs.ext2
sbin/mkfs.ext3
sbin/mkfs.gfs2