Attachment #88988 for bug #116816

Lines 141-147 Link Here

(-)genkernel-4.orig/gmi/generic/initrd.cmdline (-1 / +5 lines)
141	fi	141	fi
142	unset CMD_UNIONFS	142	unset CMD_UNIONFS
143	fi	143	fi
144	;;	144	;;
		145	# Allow user to specify the modules location
		146	modules\=*)
		147	MODULESD=${x#modules=}
		148	;;
145	esac	149	esac
146	done	150	done
147	}	151	}

Lines 28-33 Link Here

(-)genkernel-4.orig/gmi/generic/initrd.defaults (+2 lines)
28	# Dirs needed for some multi-mount fsloaders	28	# Dirs needed for some multi-mount fsloaders
29	# but are not unionized in the new root fs	29	# but are not unionized in the new root fs
30	MNTOTHER="${GMIMNT}/other"	30	MNTOTHER="${GMIMNT}/other"
		31	# Default dir to load the .mo from
		32	MODULESD="mnt/cdrom"
31		33
32	INIT="/sbin/init"	34	INIT="/sbin/init"
33		35




}


# Insert all modules found in $1, usually mnt/cdrom
# added to allow users to add their own apps.
union_insert_modules() {
	for module in `ls ${NEW_ROOT}/$1/modules/*.mo`
	do
		mkdir -p ${MEMORY}/modules/`basename ${module} .mo`
		mount -o loop,ro ${module} ${MEMORY}/modules/`basename ${module} .mo`
		union_insert_dir $UNION ${MEMORY}/modules/`basename ${module} .mo`
	done
}


Lines 552-557 Link Here

(-)genkernel-4.orig/gmi/generic/linuxrc (+9 lines)
552	# Make sure fstab notes livecd is mounted ro. Makes system skip remount which fails on unionfs dirs.	552	# Make sure fstab notes livecd is mounted ro. Makes system skip remount which fails on unionfs dirs.
553	sed -e 's\|$.\s/\stmpfs\s$defaults$.$\|\1defaults,ro\2\|' /${UNION}/etc/fstab > /${UNION}/etc/fstab.new	553	sed -e 's\|$.\s/\stmpfs\s$defaults$.$\|\1defaults,ro\2\|' /${UNION}/etc/fstab > /${UNION}/etc/fstab.new
554	mv /${UNION}/etc/fstab.new /${UNION}/etc/fstab	554	mv /${UNION}/etc/fstab.new /${UNION}/etc/fstab
		555	warn_msg "Adding all modules in $MODULESD/modules/"
		556	if [ "${MODULESD}" = "mnt/cdrom" ]
		557	then
		558	union_insert_modules mnt/cdrom
		559	else
		560	mkdir /newroot/mnt/modulesd
		561	mount "${MODULESD}" /newroot/mnt/modulesd
		562	union_insert_modules mnt/modulesd
		563	fi
555	fi	564	fi
556		565
557	# Unpacking additional packages from NFS mount	566	# Unpacking additional packages from NFS mount

Return to bug 116816

Lines 60-62 Link Here

(-)genkernel-4.orig/gmi/generic/initrd.unionfs (+11 lines)
60	}	60	}
61		61
62		62
		63	# Insert all modules found in $1, usually mnt/cdrom
		64	# added to allow users to add their own apps.
		65	union_insert_modules() {
		66	for module in `ls ${NEW_ROOT}/$1/modules/*.mo`
		67	do
		68	mkdir -p ${MEMORY}/modules/`basename ${module} .mo`
		69	mount -o loop,ro ${module} ${MEMORY}/modules/`basename ${module} .mo`
		70	union_insert_dir $UNION ${MEMORY}/modules/`basename ${module} .mo`
		71	done
		72	}
		73