Исправлен запуск cl-builder

develop
Mike Hiretsky 10 years ago
parent ad532e7855
commit 282b16af7d

@ -481,7 +481,6 @@ class fillVars(object, varsShare):
suffix = "calculate=,,timezone:%s"%(timezone)
elif lang:
suffix = "calculate=lang:%s,keymap:%s" % (lang,lang)
print suffix
return suffix
def get_cl_builder_assemble_set(self):

@ -203,11 +203,11 @@ update_from_builder() {
waschange=1
done
done
local roottype=$(cl-kernel -v --filter os_root_type | \
local roottype=$(cl-image -v --filter os_root_type | \
sed -nr 's/.*\[.\]\s//p')
if [[ "$roottype" != "livecd" ]]
then
local osRootDev=$(cl-kernel -v --filter os_root_dev | \
local osRootDev=$(cl-image -v --filter os_root_dev | \
sed -nr 's/.*\[.\]\s//p')
rootUUID=$(blkid $osRootDev | sed -r 's/^.*UUID="([^"]+)".*/\1/')
if ! diff -q <( cat /boot/grub/grub.cfg | grep linux | \

Loading…
Cancel
Save