Commits

Rodrigo Bistolfi committed 123c397 Merge

Merged in m0e_lnx/m0e-vabs (pull request #94)

grub2 enable device mapper and handle GRUB_DISTRIBUTOR differences between Vector and VLOCITY

  • Participants
  • Parent commits 13ec258, 08279ef

Comments (0)

Files changed (2)

File var/vabs/grub2/src/etc.default.grub

 export GRUB_GFXMODE=800x600x16
-export GRUB_DISTRIBUTOR=Vlocity
+export GRUB_DISTRIBUTOR=@GRUBDIST@
 export GRUB_TERMINAL=gfxterm
 export GRUB_TERMINAL_OUTPUT=gfxterm
 export GRUB_FONT=/usr/share/grub/unifont.pf2

File var/vabs/grub2/src/grub2.SlackBuild

 LDFLAG_OPTIONS=${LDFLAG_OPTIONS:-""}
 ADDRB=${ADDRB:-"os-prober >= 1.49"} #Add deps that need to be added to the slack-required file here
 EXRB=${EXRB:-""} #Add deps that need to be excluded from the slack-required file here
-MAKEDEPENDS=${MAKEDEPENDS:-"dejavu-fonts-ttf"}
+MAKEDEPENDS=${MAKEDEPENDS:-"dejavu-fonts-ttf device-mapper"}
 #----------------------------------------------------------------------------
 
 
 mkdir -p $PKG/etc/default/
 cat $CWD/etc.default.grub > $PKG/etc/default/grub
 if [ $LIBDIRSUFFIX ];then
-	sed -i s"|Vector|Vlocity|"g $PKG/etc/default/grub
+	sed -i s"|@GRUBDIST@|VLocity|"g $PKG/etc/default/grub
+else
+	sed -i s"|@GRUBDIST@|Vector|"g $PKG/etc/default/grub
 fi
 cp $CWD/05_vectorlinux_theme $PKG/etc/grub.d/
 cp $CWD/10_linux $PKG/etc/grub.d/