Skip to content

Commit

Permalink
modified: ts/build/packages/base/etc/profile
Browse files Browse the repository at this point in the history
	modified:   ts/build/packages/libreoffice/build/install
  • Loading branch information
Doncuppjr committed Jan 7, 2021
1 parent 0f135cc commit c6dcc95
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
21 changes: 13 additions & 8 deletions ts/build/packages/base/etc/profile
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,33 @@ if [ "`tty`" == "$CONSOLE" ]; then
echo "Fastboot was enabled, but something went wrong with the transfer or mount."
echo "Hopefully only Administrators ever see this message, and then only when they fail. :)"
echo "Review the log at /var/log/fastboot.log"
if [ "$LM" == "2" ] && ! mountpoint /boot; then
if ! module_available vfat; then
case $LM in
2) if ! module_available vfat; then
echo "syslinux: vfat module not available"
else
echo "syslinux: /boot was not mounted, maybe check your mount declarations"
fi
elif [ "$LM" == "3" ] && ! pkg_initialized autonet; then
;;
3)
if pkg_is_loaded networkmanager; then
echo "pxelinux: Package networkmager does not work with this technology, try autonet"
else
elif ! pkg_initialized autonet; then
echo "pxelinux: Package autonet not available"
else
echo "pxelinux: Maybe we didn't get the server"
fi
elif [ "$LM" == "4" ] && ! mountpoint /mnt/cdrom0; then
;;
4)
if ! module_available isofs && ! module_available udf; then
echo "isolinux: No CD Rom modules available"
else
echo "isolinux: /mnt/cdrom0 was not mounted, maybe"
echo "isolinux: /mnt/cdrom0 was not mounted, maybe check your mount declarations"
fi
elif [ -z "$LM" ]; then
;;
*)
echo "Fastboot enabled, but no loader method was defined, what are you doing?"
fi
;;
esac
else
echo "There are no autostarted sessions!"
fi
Expand Down
2 changes: 1 addition & 1 deletion ts/build/packages/libreoffice/build/install
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if [ -n "$1" ]; then
else
ls */DEBS/*.deb */DEBS/desktop-integration/*.deb 2>/dev/null | while read file
do
if [ -n "`echo $file | grep -v dict-es | grep -v dict-fr | grep -v extension`" ]; then
if [ -n "`echo $file | grep -v dict-es | grep -v dict-fr`" ]; then
ar -xf $file
let returnval=returnval+$?
tar -C ../$installdir -xf data.tar.*
Expand Down

0 comments on commit c6dcc95

Please sign in to comment.