Diff of /tags/grubby-8_37/new-kernel-pkg

Parent Directory | Revision Log | Patch

	revision 2248 by niro, Mon Oct 21 13:55:31 2013 UTC	revision 2681 by niro, Wed Jul 16 09:48:55 2014 UTC
#	Line 116  elif [[ ${ARCH} =~ armv[5|7].*l ]]	Line 116  elif [[ ${ARCH} =~ armv[5|7].*l ]]
116	then	then
117	liloConfig=""	liloConfig=""
118	bootPrefix=/boot	bootPrefix=/boot
119		extlinuxConfig=$(readlink -f /etc/extlinux.conf 2>/dev/null)
120	ubootDir=${UBOOT_DIR:-"/boot"}	ubootDir=${UBOOT_DIR:-"/boot"}
121	ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}	ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
122	ubootKList=${UBOOT_KLIST:-"klist.txt"}	ubootKList=${UBOOT_KLIST:-"klist.txt"}
#	Line 220  install()	Line 221  install()
221	if [[ -n ${banner} ]]	if [[ -n ${banner} ]]
222	then	then
223	title="${banner} [ ${version} ]"	title="${banner} [ ${version} ]"
224	elif [[ $(read_os_release id) = magellan ]]	elif [ -f /etc/os-release ]
225	then	then
226	title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"	title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
227	elif [ -f /etc/mageversion ]	elif [ -f /etc/mageversion ]
#	Line 453  update()	Line 454  update()
454	--update-kernel=${kernelImage} \	--update-kernel=${kernelImage} \
455	${INITRD} \	${INITRD} \
456	${kernargs:+--args="${kernargs}"} \	${kernargs:+--args="${kernargs}"} \
457	${removeargs:+--remove-args="${removeargs}"}	${removeargs:+--remove-args="${removeargs}"} \
458		${mbkernel:+--add-multiboot="${mbkernel}"}
459	else	else
460	[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"	[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
461	fi	fi

---

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

Legend: Removed from v.2248   changed lines   Added in v.2681