Unified · Split
| @@ -40,14 +40,6 @@ error_out() { · 39 unmodified lines | |||
| 40 | exit 1 | 40 | exit 1 |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | umount_kernel_fs() { | ||
| 44 | for f in sys/fs/cgroup/systemd sys/fs/cgroup dev/shm dev/pts dev proc sys run; do | ||
| 45 | if [ -d $ROOTFS/kernel_temp/$f ]; then | ||
| 46 | umount $ROOTFS/kernel_temp/$f || true | ||
| 47 | fi | ||
| 48 | done | ||
| 49 | } | ||
| 50 | |||
| 51 | write_etc_motd() { | 43 | write_etc_motd() { |
| 52 | cat >> "$ROOTFS/etc/motd" <<_EOF | 44 | cat >> "$ROOTFS/etc/motd" <<_EOF |
| 53 | ############################################################################### | 45 | ############################################################################### |
| @@ -158,8 +150,6 @@ generate_initramfs() { · 104 unmodified lines | |||
| 158 | --add " dmsquash-live vmklive " --${COMPRESSTYPE} \ | 150 | --add " dmsquash-live vmklive " --${COMPRESSTYPE} \ |
| 159 | "/boot/initrd.lz" >>$LOGFILE 2>&1 | 151 | "/boot/initrd.lz" >>$LOGFILE 2>&1 |
| 160 | 152 | ||
| 161 | umount_kernel_fs | ||
| 162 | |||
| 163 | mv $ROOTFS/kernel_temp/boot/initrd.lz $BOOT_DIR | 153 | mv $ROOTFS/kernel_temp/boot/initrd.lz $BOOT_DIR |
| 164 | # We rely on pam now, so let's install the host login config. | 154 | # We rely on pam now, so let's install the host login config. |
| 165 | install -Dm644 $ROOTFS/kernel_temp/etc/pam.d/login \ | 155 | install -Dm644 $ROOTFS/kernel_temp/etc/pam.d/login \ |