Commit bf1431ac authored by Christopher Spinrath's avatar Christopher Spinrath

Merge branch 'master' of shin-project:lipck

parents 9d062ba7 36e30b72
......@@ -299,7 +299,7 @@ help:
@echo " If you have mounted an image/partition (e.g. an empty image created in 1.) set IMAGE_DIR to the mount point,"
@echo " (e.g. \"# make IMAGE_DIR=/your/mountpoint image\") to update it."
@echo
@echo "There is a list of all available phony targets is available under \"make listall\""
@echo "There is a list of all phony targets available under \"make listall\""
listall:
@echo "Available targets: "
......
......@@ -121,8 +121,19 @@ function copy_modprobe_d()
update-initramfs -u
}
function prevent_ubiquity_update()
{
echo "ubiquity hold" | dpkg --set-selections
}
function allow_ubiquity_update()
{
echo "ubiquity install" | dpkg --set-selections
}
divert_initctl
prevent_ubiquity_update #required because of launchpad bug #1373033
prepare_install
copy_modprobe_d
install_packages
......@@ -136,5 +147,7 @@ patch_all "$SCRIPT_DIR/patches/" "/"
#echo "compiling glib2 schemas..."
#glib-compile-schemas /usr/share/glib-2.0/schemas
allow_ubiquity_update #required because of launchpad bug #1373033
revert_initctl
finalize
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment