openstack/diskimage-builder
Code Issues Proposed changes

Change the rootfs label in fedora's /etc/fstab.

Browse Source 
The images produced by the diskimage-builder have their filesystem with
a label of "cloudimg-rootfs", so we need to change the default /etc/fstab
on fedora to reflect that.

Change-Id: Id1bb00cb81cb200a114f500e26272624be577da0
This commit is contained in:
Lucas Alvares Gomes 2013-06-05 11:44:32 +01:00
parent 8532b3d7ad
commit 6219ad7917
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/fedora/post-install.d/05-fstab-rootfs-label Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
# Fedora sets up for root to have a label of "_/"
sed -i "s%LABEL=_/%LABEL=cloudimg-rootfs%" /etc/fstab

2
elements/vm/finalise.d/51-grub
View File

@ -53,8 +53,6 @@ fi
sed -i "s%$PART_DEV%LABEL=cloudimg-rootfs%" $GRUB_CFG sed -i "s%$PART_DEV%LABEL=cloudimg-rootfs%" $GRUB_CFG
sed -i "s%search --no-floppy --fs-uuid --set=root .*$%search --no-floppy --set=root --label cloudimg-rootfs%" $GRUB_CFG sed -i "s%search --no-floppy --fs-uuid --set=root .*$%search --no-floppy --set=root --label cloudimg-rootfs%" $GRUB_CFG
sed -i "s%root=UUID=[A-Za-z0-9\-]*%root=LABEL=cloudimg-rootfs%" $GRUB_CFG sed -i "s%root=UUID=[A-Za-z0-9\-]*%root=LABEL=cloudimg-rootfs%" $GRUB_CFG
# Fedora sets up for root to have a label of "_/"
sed -i "s%LABEL=_/%LABEL=cloudimg-rootfs%" /etc/fstab
if [ $DIST = 'Fedora' ] ; then if [ $DIST = 'Fedora' ] ; then
# enable serial console # enable serial console
sed -i "s%LABEL=cloudimg-rootfs%LABEL=cloudimg-rootfs console=tty0 console=ttyS0,115200%" $GRUB_CFG sed -i "s%LABEL=cloudimg-rootfs%LABEL=cloudimg-rootfs console=tty0 console=ttyS0,115200%" $GRUB_CFG