Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TARDIS
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
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
TARDIS
Commits
e82186d5
Commit
e82186d5
authored
Feb 19, 2019
by
OSAK Buildhauer
Browse files
Options
Downloads
Patches
Plain Diff
grub.cfg fixed
parent
96098c62
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
assemble_image.sh
+8
-2
8 additions, 2 deletions
assemble_image.sh
grub_config.sh
+6
-10
6 additions, 10 deletions
grub_config.sh
grub_template.cfg
+2
-2
2 additions, 2 deletions
grub_template.cfg
with
16 additions
and
14 deletions
assemble_image.sh
+
8
−
2
View file @
e82186d5
...
@@ -24,8 +24,14 @@ rsync -av /usr/share/grub/unicode.pf2 "$workspace/part_files"/grub/fonts/
...
@@ -24,8 +24,14 @@ rsync -av /usr/share/grub/unicode.pf2 "$workspace/part_files"/grub/fonts/
mv
"
$workspace
/part_files"
/grub/
*
"
$workspace
/part_files"
/boot/grub/
mv
"
$workspace
/part_files"
/grub/
*
"
$workspace
/part_files"
/boot/grub/
rm
-rf
"
$workspace
/part_files"
/grub
rm
-rf
"
$workspace
/part_files"
/grub
cp
"
$kubuntu
"
"
$workspace
/part_files/kubuntu.iso"
rsync
--size-only
--checksum
"
$kubuntu
"
"
$workspace
/part_files/"
cp
"
$xubuntu
"
"
$workspace
/part_files/xubuntu.iso"
rsync
--size-only
--checksum
"
$xubuntu
"
"
$workspace
/part_files/"
source
./grub_config.sh
# functions to fill grub_template.cfg
cp
grub_template.cfg
"
$workspace
/part_files/boot/grub/grub.cfg"
fill_grub_config_template
"
$kubuntu
"
"KDE"
"
$workspace
/part_files/boot/grub/grub.cfg"
fill_grub_config_template
"
$xubuntu
"
"XFCE"
"
$workspace
/part_files/boot/grub/grub.cfg"
./create_offlinerepo.sh
"
$workspace
/part_files/archives"
"
$kubuntu
"
$(
grep
'^[^#]'
packages |
cut
-d
'|'
-f
2
)
./create_offlinerepo.sh
"
$workspace
/part_files/archives"
"
$kubuntu
"
$(
grep
'^[^#]'
packages |
cut
-d
'|'
-f
2
)
cp
packages
"
$workspace
/part_files/packages"
cp
packages
"
$workspace
/part_files/packages"
...
...
This diff is collapsed.
Click to expand it.
grub_config.sh
+
6
−
10
View file @
e82186d5
...
@@ -23,7 +23,7 @@ function extract_release() {
...
@@ -23,7 +23,7 @@ function extract_release() {
echo
"
${
flavor
^
}
$number
"
# ^ capitalizes 1st letter
echo
"
${
flavor
^
}
$number
"
# ^ capitalizes 1st letter
}
}
function
sed
_grub_template
()
{
function
fill
_grub_
config_
template
()
{
iso_file
=
"
$1
"
iso_file
=
"
$1
"
distribution_grep
=
"
$2
"
# KDE / XFCE
distribution_grep
=
"
$2
"
# KDE / XFCE
sed_target
=
"
$3
"
sed_target
=
"
$3
"
...
@@ -33,12 +33,8 @@ function sed_grub_template() {
...
@@ -33,12 +33,8 @@ function sed_grub_template() {
sed
"s|__
${
distribution_grep
}
_ISONAME__|
$iso_file
|g"
-i
"
$sed_target
"
sed
"s|__
${
distribution_grep
}
_ISONAME__|
$iso_file
|g"
-i
"
$sed_target
"
}
}
# image flavors to put in the grub config
# usage after sourcing (modifies grub_template_copy.cfg)
kubuntu
=
kubuntu-18.04.1-desktop-amd64.iso
# cp grub_template.cfg grub_template_copy.cfg
xubuntu
=
xubuntu-18.04.1-desktop-amd64.iso
# fill_grub_config_template "kubuntu-18.04.1-desktop-amd64.iso" "KDE" "grub_template_copy.cfg"
grub_template
=
"grub_template.cfg"
# fill_grub_config_template "xubuntu-18.04.1-desktop-amd64.iso" "XFCE" "grub_template_copy.cfg"
grub_target
=
"grub_target.cfg"
cp
"
$grub_template
"
"
$grub_target
"
sed_grub_template
"
$kubuntu
"
"KDE"
"
$grub_target
"
sed_grub_template
"
$xubuntu
"
"XFCE"
"
$grub_target
"
This diff is collapsed.
Click to expand it.
grub_template.cfg
+
2
−
2
View file @
e82186d5
...
@@ -16,7 +16,7 @@ set gfxpayload=keep
...
@@ -16,7 +16,7 @@ set gfxpayload=keep
function
kde_LoadCasper
{
function
kde_LoadCasper
{
loopback
loop
($root)/${kde_isoname}
loopback
loop
($root)/${kde_isoname}
echo
"Loading
kernel"
echo
"Loading
kernel"
linux
(loop)__KDE_KERNEL__
boot
=
casper file=/isodevice/preseed/lip.seed ${cmdline} iso-scan/filename=/
kubuntu.iso
sysrq_always_enabled pstore.pstore_disable nosplash verbose --
linux
(loop)__KDE_KERNEL__
boot
=
casper file=/isodevice/preseed/lip.seed ${cmdline} iso-scan/filename=/
__KDE_ISONAME__
sysrq_always_enabled pstore.pstore_disable nosplash verbose --
echo
"Loading
initrd"
echo
"Loading
initrd"
initrd
(loop)__KDE_INITRD__
initrd
(loop)__KDE_INITRD__
echo
"Starting
kernel"
echo
"Starting
kernel"
...
@@ -57,7 +57,7 @@ function kde_menu {
...
@@ -57,7 +57,7 @@ function kde_menu {
function
xfce_LoadCasper
{
function
xfce_LoadCasper
{
loopback
loop
($root)/${xfce_isoname}
loopback
loop
($root)/${xfce_isoname}
echo
"Loading
kernel"
echo
"Loading
kernel"
linux
(loop)__XFCE_KERNEL__
boot
=
casper file=/isodevice/preseed/lip.seed ${cmdline} iso-scan/filename=/
kubuntu.iso
sysrq_always_enabled pstore.pstore_disable nosplash verbose --
linux
(loop)__XFCE_KERNEL__
boot
=
casper file=/isodevice/preseed/lip.seed ${cmdline} iso-scan/filename=/
__XFCE_ISONAME__
sysrq_always_enabled pstore.pstore_disable nosplash verbose --
echo
"Loading
initrd"
echo
"Loading
initrd"
initrd
(loop)__XFCE_INITRD__
initrd
(loop)__XFCE_INITRD__
echo
"Starting
kernel"
echo
"Starting
kernel"
...
...
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