Diff of /mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall

Parent Directory | Revision Log | Patch

	revision 2715 by niro, Wed Jul 6 22:02:19 2011 UTC	revision 2716 by niro, Mon Aug 8 08:23:09 2011 UTC
#	Line 30  NEW_ALX_DHCP_PROG="/sbin/udhcpc"	Line 30  NEW_ALX_DHCP_PROG="/sbin/udhcpc"
30	NEW_ALX_DHCP_START="-T 10 -t 5 -n -i"	NEW_ALX_DHCP_START="-T 10 -t 5 -n -i"
31	NEW_ALX_DHCP_STOP=""	NEW_ALX_DHCP_STOP=""
32	NEW_MIN_DISK_SPACE="85000"	NEW_MIN_DISK_SPACE="85000"
33		NEW_ALX_PLUGINS="/etc/alxconfig-ng/plugins"
34
35	read_value()	read_value()
36	{	{
#	Line 70  updateconfig()	Line 71  updateconfig()
71	done	done
72	}	}
73
74		updategrub2()
75		{
76		# create a device.map
77		if [[ ! -f /boot/grub/device.map ]]
78		then
79		grub-mkdevicemap
80		fi
81
82		# needed by grub-mkconfig on the first run
83		if [[ ! -f /boot/grub/video.lst ]]
84		then
85		install -m0644 /lib/grub/*/video.lst /boot/grub/video.lst
86		fi
87
88		# update grub.cfg
89		grub-mkconfig -o /boot/grub/grub.cfg
90
91		# install bootloader to disk
92		local bootdisk
93		bootdisk="$(grub-probe --target=drive /boot | sed 's:(\(.*\),.*):(\1):')"
94
95		# Generate core.img, but don't let it be installed in boot sector
96		grub-install --no-floppy "${bootdisk}"
97		}
98
99	# fix mage.rc	# fix mage.rc
100	CONFIG="${MAGERC}"	CONFIG="${MAGERC}"
101	updateconfig RSYNC MIRRORS MAGE_DISTRIBUTION PACKAGES_SERVER_PATH MAGE_UNINSTALL_TIMEOUT	updateconfig RSYNC MIRRORS MAGE_DISTRIBUTION PACKAGES_SERVER_PATH MAGE_UNINSTALL_TIMEOUT
102
103	# fix config.rc	# fix config.rc
104	CONFIG="${CONFIGRC}"	CONFIG="${CONFIGRC}"
105	updateconfig ALX_NETWORKING ALX_DHCP_PROG ALX_DHCP_START ALX_DHCP_STOP MIN_DISK_SPACE	updateconfig ALX_NETWORKING ALX_DHCP_PROG ALX_DHCP_START ALX_DHCP_STOP MIN_DISK_SPACE ALX_PLUGINS
106
107	# fix profile	# fix profile
108	if [[ $(readlink /etc/mage-profile) != */${MAGEPROFILE} ]]	if [[ $(readlink /etc/mage-profile) != */${MAGEPROFILE} ]]
#	Line 157  then	Line 183  then
183	mage install ${BASESYSTEM}	mage install ${BASESYSTEM}
184	unset MAGE_BOOTSTRAP	unset MAGE_BOOTSTRAP
185
186		# fix locale
187		echo "LANG=\"de_DE\"" > /etc/conf.d/locale
188
189	# enable run of orphaned files check	# enable run of orphaned files check
190	touch /.orphaned	touch /.orphaned
191
#	Line 232  then	Line 261  then
261	install -d /etc/modprobe.d	install -d /etc/modprobe.d
262	mv ${i} /etc/modprobe.d/${i%.conf}.conf	mv ${i} /etc/modprobe.d/${i%.conf}.conf
263	done	done
264
265		mount /boot &> /dev/null
266		# install an appropriate uvesafb.conf
267		install -d /etc/modprobe.d || die
268		echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > /etc/modprobe.d/uvesafb.conf || die
269		# create an updated initrd
270		local DISKMODS="sd_mod"
271		local OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
272		local PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
273		local SATAMODS="sata_via sata_sis sata_nv"
274		local DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
275		local FBMODS="uvesafb"
276		echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd
277		local kernelver=$(readlink /boot/vmlinuz | sed 's:kernel-::')
278		mkinitrd -f /boot/initrd-${kernelver}.img ${kernelver}
279		# update grub bootloader
280		updategrub2
281	fi	fi
282
283	if [[ -f /.orphaned ]]	if [[ -f /.orphaned ]]

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2715   changed lines   Added in v.2716