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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
osak
lipck
Commits
6f1f7cfc
Commit
6f1f7cfc
authored
9 years ago
by
Christopher Spinrath
Browse files
Options
Downloads
Patches
Plain Diff
rootfs_remaster: move simple copy ops to Makefile
parent
fe3723be
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
+12
-0
12 additions, 0 deletions
Makefile
scripts/rootfs_remaster.sh
+3
-24
3 additions, 24 deletions
scripts/rootfs_remaster.sh
with
15 additions
and
24 deletions
Makefile
+
12
−
0
View file @
6f1f7cfc
...
...
@@ -239,6 +239,16 @@ ifneq ($(strip $(APT_SOURCE_URL_OVERRIDE)),)
echo
"deb
$(
APT_SOURCE_URL_OVERRIDE
)
$(
ISO_RELEASE
)
-updates main restricted universe multiverse"
\
>>
"
$(
call archdir,
$*
)$(
ROOTFS
)
/etc/apt/sources.list"
endif
#set timezone
echo
-n
"Europe/Berlin"
>
"
$(
call archdir,
$*
)$(
ROOTFS
)
/etc/timezone"
#install kde defaults
mkdir
-p
"
$(
call archdir,
$*
)$(
ROOTFS
)
/etc/skel/.kde/share/config/"
cp
"$(CURDIR)/contrib/rootfs/kde_config/"
*
"$(call archdir,$*)$(ROOTFS)/etc/skel/.kde/share/config/"
#install modprobe.d files
cp
"$(CURDIR)/contrib/rootfs/modprobe.d/"
*
"$(call archdir,$*)$(ROOTFS)/etc/modprobe.d/"
#install sysctl.d files
cp
"$(CURDIR)/contrib/rootfs/sysctl.d/"
*
"$(call archdir,$*)$(ROOTFS)/etc/sysctl.d/"
mkdir
-p
"$(call archdir,$*)$(LXC_DIR)"
lxc-execute
--name
"lipck_remaster_$*"
-P
"$(call archdir,$*)$(LXC_DIR)"
-f
"$(CURDIR)/config/lxc_common.conf"
\
-s
lxc.arch
=
"
$*
"
-s
lxc.rootfs
=
"
$(
call archdir,
$*
)$(
ROOTFS
)
"
\
...
...
@@ -274,6 +284,8 @@ $(call gentargets,$(STATE_DIR)/rootfs_finalized) : $(call archdir,%)$(STATE_DIR)
$(
RM
)
"
$(
call archdir,
$*
)$(
ROOTFS
)
/etc/resolv.conf"
if
[
-e
"
$(
call archdir,
$*
)$(
ROOTFS
)
/etc/resolv.conf.bak"
]
;
then
mv
"
$(
call archdir,
$*
)$(
ROOTFS
)
/etc/resolv.conf.bak"
"
$(
call archdir,
$*
)$(
ROOTFS
)
/etc/resolv.conf"
;
fi
$(
RM
)
-r
"
$(
call archdir,
$*
)$(
ROOTFS
)
/remaster"
#clean up crash reports
$(
RM
)
-rf
"
$(
call archdir,
$*
)$(
ROOTFS
)
/var/crash/"
*
$(
RM
)
"
$(
call archdir,
$*
)$(
STATE_DIR
)
/rootfs_prepared"
touch
"
$(
call archdir,
$*
)$(
STATE_DIR
)
/rootfs_finalized"
...
...
This diff is collapsed.
Click to expand it.
scripts/rootfs_remaster.sh
+
3
−
24
View file @
6f1f7cfc
...
...
@@ -98,9 +98,9 @@ function install_packages()
function
finalize
()
{
echo
-n
"Europe/Berlin"
>
/etc/timezone
rm
-rf
/var/crash/
*
#update initramfs - both this script and lipck may have changed files
#that should be copied over in the initramfs
update-initramfs
-u
if
[
-z
"
$LIPCK_HAS_APT_CACHE
"
]
then
...
...
@@ -108,23 +108,6 @@ function finalize()
fi
}
function
install_kde_defaults
()
{
mkdir
-p
/etc/skel/.kde/share/config/
cp
"
$CONTRIB_DIR
/kde_config/"
*
/etc/skel/.kde/share/config/
}
function
copy_modprobe_d
()
{
cp
"
$SCRIPT_DIR
/contrib/modprobe.d/"
*
"/etc/modprobe.d/"
update-initramfs
-u
}
function
copy_sysctl_d
()
{
cp
"
$SCRIPT_DIR
/contrib/sysctl.d/"
*
"/etc/sysctl.d/"
}
function
hold_packages
()
{
for
PKG
in
$@
;
do
...
...
@@ -146,12 +129,8 @@ PKGS_TO_HOLD=$(get_packages_from_file "$CONTRIB_DIR/hold_packages")
hold_packages
$PKGS_TO_HOLD
prepare_install
copy_modprobe_d
copy_sysctl_d
install_packages
install_kde_defaults
#i.e. required for applying default-wallpaper patch
#echo "compiling glib2 schemas..."
#glib-compile-schemas /usr/share/glib-2.0/schemas
...
...
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