mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-11 23:16:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #217 from marineam/diskless

Browse Source 
fix(vm_image_util): Remove fstab from PXE initrd
This commit is contained in:
Michael Marineau 2014-04-05 13:43:48 -07:00
commit dd8e7c8be4
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build_library/vm_image_util.sh
View File

@ -316,22 +316,9 @@ _write_cpio_common() {
# packed into the squashfs image. Just ROOT. # packed into the squashfs image. Just ROOT.
sudo umount --all-targets "${VM_TMP_ROOT}/media/state" sudo umount --all-targets "${VM_TMP_ROOT}/media/state"
# Set squashfs as the default root filesystem
sudo_clobber "${cpio_target}/etc/fstab" <<EOF
${squashfs} /sysroot squashfs x-initrd.mount 0 0
tmpfs /sysroot/usr/share/oem tmpfs size=0,mode=755,x-initrd.mount 0 0
EOF
# Inject /usr/.noupdate into squashfs to disable update_engine # Inject /usr/.noupdate into squashfs to disable update_engine
echo "/usr/.noupdate f 444 root root echo -n" >"${VM_TMP_DIR}/extra" echo "/usr/.noupdate f 444 root root echo -n" >"${VM_TMP_DIR}/extra"
else else
# Set tmpfs as default root, squashfs as default /usr
sudo_clobber "${cpio_target}/etc/fstab" <<EOF
tmpfs /sysroot tmpfs mode=755,x-initrd.mount 0 0
${squashfs} /sysroot/usr squashfs x-initrd.mount 0 0
tmpfs /sysroot/usr/share/oem tmpfs size=0,mode=755,x-initrd.mount 0 0
EOF
# Use OEM cloud-config to setup the core user's password # Use OEM cloud-config to setup the core user's password
if [[ -s /etc/shared_user_passwd.txt ]]; then if [[ -s /etc/shared_user_passwd.txt ]]; then
sudo mkdir -p "${cpio_target}/usr/share/oem" sudo mkdir -p "${cpio_target}/usr/share/oem"