Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Tools
development-tools
manjaro-tools
Commits
a7005c52
Commit
a7005c52
authored
Jan 24, 2016
by
udeved
Browse files
rename util-livecd.sh --> util-live.sh
parent
8289b954
Changes
4
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
a7005c52
...
...
@@ -69,7 +69,7 @@ LIBS_ISO = \
lib/util-iso-overlayfs.sh
\
lib/util-iso-image.sh
\
lib/util-iso-calamares.sh
\
lib/util-live
cd
.sh
\
lib/util-live.sh
\
lib/util-iso-boot.sh
\
lib/util-publish.sh
\
lib/util-iso-log.sh
...
...
data/scripts/livecd
View file @
a7005c52
...
...
@@ -5,7 +5,7 @@ livetimer=$(date +%s%3N)
load_profile_config
"/opt/livecd/profile.conf"
[[
-r
/opt/livecd/util-live
cd
.sh
]]
&&
source
/opt/livecd/util-live
cd
.sh
[[
-r
/opt/livecd/util-live.sh
]]
&&
source
/opt/livecd/util-live.sh
echo
"Loaded scripts:
$(
elapsed_time_ms
${
livetimer
}
)
ms"
>>
/var/log/livecd.log
livetimer
=
$(
get_timer_ms
)
...
...
data/scripts/mhwd-live
View file @
a7005c52
#!/bin/sh
[[
-r
/opt/livecd/util.sh
]]
&&
source
/opt/livecd/util.sh
[[
-r
/opt/livecd/util-live
cd
.sh
]]
&&
source
/opt/livecd/util-live
cd
.sh
[[
-r
/opt/livecd/util-live.sh
]]
&&
source
/opt/livecd/util-live.sh
USENONFREE
=
"
$(
kernel_cmdline nonfree no
)
"
VIDEO
=
"
$(
kernel_cmdline xdriver no
)
"
...
...
lib/util-iso-image.sh
View file @
a7005c52
...
...
@@ -39,7 +39,7 @@ write_profile_conf_entries(){
copy_livecd_helpers
(){
msg2
"Copying livecd helpers ..."
[[
!
-d
$1
]]
&&
mkdir
-p
$1
cp
${
LIBDIR
}
/util-live
cd
.sh
$1
cp
${
LIBDIR
}
/util-live.sh
$1
cp
${
LIBDIR
}
/util-msg.sh
$1
cp
${
LIBDIR
}
/util.sh
$1
cp
${
DATADIR
}
/scripts/kbd-model-map
$1
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment