Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lipck
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
osak
lipck
Commits
bf1431ac
Commit
bf1431ac
authored
10 years ago
by
Christopher Spinrath
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of shin-project:lipck
parents
9d062ba7
36e30b72
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+1
-1
1 addition, 1 deletion
Makefile
scripts/remaster_rootfs.sh
+13
-0
13 additions, 0 deletions
scripts/remaster_rootfs.sh
with
14 additions
and
1 deletion
Makefile
+
1
−
1
View file @
bf1431ac
...
@@ -299,7 +299,7 @@ help:
...
@@ -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
" 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
" (e.g.
\"
# make IMAGE_DIR=/your/mountpoint image
\"
) to update it."
@
echo
@
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
:
listall
:
@
echo
"Available targets: "
@
echo
"Available targets: "
...
...
This diff is collapsed.
Click to expand it.
scripts/remaster_rootfs.sh
+
13
−
0
View file @
bf1431ac
...
@@ -121,8 +121,19 @@ function copy_modprobe_d()
...
@@ -121,8 +121,19 @@ function copy_modprobe_d()
update-initramfs
-u
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
divert_initctl
prevent_ubiquity_update
#required because of launchpad bug #1373033
prepare_install
prepare_install
copy_modprobe_d
copy_modprobe_d
install_packages
install_packages
...
@@ -136,5 +147,7 @@ patch_all "$SCRIPT_DIR/patches/" "/"
...
@@ -136,5 +147,7 @@ patch_all "$SCRIPT_DIR/patches/" "/"
#echo "compiling glib2 schemas..."
#echo "compiling glib2 schemas..."
#glib-compile-schemas /usr/share/glib-2.0/schemas
#glib-compile-schemas /usr/share/glib-2.0/schemas
allow_ubiquity_update
#required because of launchpad bug #1373033
revert_initctl
revert_initctl
finalize
finalize
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment