root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[lsb-release] has to be changed in root-image

Browse source
This commit is contained in:
Philip 2017-01-25 13:12:16 +01:00
parent e6749a9181
commit c8710510b2
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/util-iso-image.sh
View file

@ -113,7 +113,6 @@ configure_mhwd_drivers(){
} }
configure_lsb(){ configure_lsb(){
[[ -f $1/boot/grub/grub.cfg ]] && rm $1/boot/grub/grub.cfg
if [ -e $1/etc/lsb-release ] ; then if [ -e $1/etc/lsb-release ] ; then
msg2 "Configuring lsb-release" msg2 "Configuring lsb-release"
sed -i -e "s/^.*DISTRIB_RELEASE.*/DISTRIB_RELEASE=${dist_release}/" $1/etc/lsb-release sed -i -e "s/^.*DISTRIB_RELEASE.*/DISTRIB_RELEASE=${dist_release}/" $1/etc/lsb-release
@ -248,7 +247,6 @@ configure_thus(){
configure_live_image(){ configure_live_image(){
msg "Configuring [livefs]" msg "Configuring [livefs]"
configure_hosts "$1" configure_hosts "$1"
configure_lsb "$1"
configure_mhwd "$1" configure_mhwd "$1"
configure_system "$1" configure_system "$1"
configure_services "$1" configure_services "$1"
@ -352,4 +350,5 @@ clean_up_image(){
fi fi
fi fi
find "$1" -name *.pacnew -name *.pacsave -name *.pacorig -delete find "$1" -name *.pacnew -name *.pacsave -name *.pacorig -delete
[[ -f $1/boot/grub/grub.cfg ]] && rm $1/boot/grub/grub.cfg
} }

2
lib/util-iso.sh
View file

@ -242,6 +242,8 @@ make_image_root() {
reset_pac_conf "${path}" reset_pac_conf "${path}"
configure_lsb "${path}"
clean_up_image "${path}" clean_up_image "${path}"
: > ${work_dir}/build.${FUNCNAME} : > ${work_dir}/build.${FUNCNAME}
msg "Done [Base installation] (rootfs)" msg "Done [Base installation] (rootfs)"