Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
nl6720
archiso
Commits
8e9c65fa
Commit
8e9c65fa
authored
May 27, 2012
by
Gerardo Exequiel Pozzi
Browse files
[archiso] mkarchiso: improve info messages
Signed-off-by:
Gerardo Exequiel Pozzi
<
vmlinuz386@yahoo.com.ar
>
parent
0b39407e
Changes
1
Hide whitespace changes
Inline
Side-by-side
archiso/mkarchiso
View file @
8e9c65fa
...
...
@@ -233,7 +233,7 @@ _pacman ()
# Cleanup root-image
_cleanup
()
{
_msg_info
"Cleaning up what we can on root-image"
_msg_info
"Cleaning up what we can on root-image
...
"
# remove the initcpio images that were generated for the host system
if
[[
-d
"
${
work_dir
}
/root-image/boot"
]]
;
then
...
...
@@ -269,6 +269,7 @@ _cleanup () {
if
[[
!
-L
"
${
work_dir
}
/root-image/etc/mtab"
]]
;
then
ln
-sf
"/proc/self/mounts"
"
${
work_dir
}
/root-image/etc/mtab"
fi
_msg_info
"Done!"
}
# Makes a SquashFS filesystem image of file/directory passes as argument with desired compression.
...
...
@@ -327,7 +328,7 @@ _mkfs () {
fi
fi
_msg_info
"Creating
${
_fs_type
}
image of
${
_fs_size
}
MiB"
_msg_info
"Creating
${
_fs_type
}
image of
${
_fs_size
}
MiB
...
"
rm
-f
"
${
_fs_img
}
"
dd
of
=
"
${
_fs_img
}
"
count
=
0
bs
=
1M
seek
=
${
_fs_size
}
&> /dev/null
local
_qflag
=
""
...
...
@@ -354,9 +355,11 @@ _mkfs () {
_msg_error
"Invalid filesystem:
${
_fs_type
}
"
1
;;
esac
_msg_info
"Done!"
_mount_fs
"
${
_fs_img
}
"
"
${
work_dir
}
/mnt/
${
_src
}
"
_msg_info
"Copying '
${
_fs_src
}
/' to '
${
work_dir
}
/mnt/
${
_src
}
/'"
_msg_info
"Copying '
${
_fs_src
}
/' to '
${
work_dir
}
/mnt/
${
_src
}
/'
...
"
rsync
-aH
"
${
_fs_src
}
/"
"
${
work_dir
}
/mnt/
${
_src
}
/"
_msg_info
"Done!"
_umount_fs
"
${
work_dir
}
/mnt/
${
_src
}
"
}
...
...
@@ -367,7 +370,7 @@ command_checksum () {
for
_chk_arch
in
i686 x86_64
;
do
if
_is_directory_changed
"
${
work_dir
}
/iso/
${
install_dir
}
"
"
${
work_dir
}
/iso/
${
install_dir
}
/checksum.
${
_chk_arch
}
.md5"
;
then
_msg_info
"Creating checksum file for self-test (
${
_chk_arch
}
)"
_msg_info
"Creating checksum file for self-test (
${
_chk_arch
}
)
...
"
cd
"
${
work_dir
}
/iso/
${
install_dir
}
"
if
[[
-d
"
${
_chk_arch
}
"
]]
;
then
md5sum
aitab
>
checksum.
${
_chk_arch
}
.md5
...
...
@@ -386,7 +389,7 @@ command_pkglist () {
_show_config pkglist
if
_is_directory_changed
"
${
work_dir
}
/root-image/var/lib/pacman/local"
"
${
work_dir
}
/iso/
${
install_dir
}
/pkglist.
${
arch
}
.txt"
;
then
_msg_info
"Creating a list of installed packages on live-enviroment"
_msg_info
"Creating a list of installed packages on live-enviroment
...
"
pacman
-Sl
-r
"
${
work_dir
}
/root-image"
--config
"
${
pacman_conf
}
"
|
\
awk
'/\[installed\]$/ {print $1 "/" $2 "-" $3}'
>
\
"
${
work_dir
}
/iso/
${
install_dir
}
/pkglist.
${
arch
}
.txt"
...
...
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