xbps-casper: fix some errors introduced in previous.
--HG-- branch : gnome3
This commit is contained in:
parent
d5bad71e31
commit
5581f27015
11 changed files with 13 additions and 12 deletions
|
@ -23,6 +23,7 @@ tried=/tmp/tried
|
||||||
[ -f /etc/casper.conf ] && . /etc/casper.conf
|
[ -f /etc/casper.conf ] && . /etc/casper.conf
|
||||||
export USERNAME USERFULLNAME HOST BUILD_SYSTEM
|
export USERNAME USERFULLNAME HOST BUILD_SYSTEM
|
||||||
|
|
||||||
|
. /scripts/functions
|
||||||
. /scripts/casper-helpers
|
. /scripts/casper-helpers
|
||||||
|
|
||||||
if [ ! -f /casper.vars ]; then
|
if [ ! -f /casper.vars ]; then
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
PREREQ=""
|
PREREQ=""
|
||||||
DESCRIPTION="Setting up /cdrom mountpoint"
|
DESCRIPTION="Setting up /cdrom mountpoint"
|
||||||
|
|
||||||
[ -r /scripts/casper-functions ] && . /scripts/casper-functions
|
[ -r /scripts/functions ] && . /scripts/functions
|
||||||
|
|
||||||
prereqs()
|
prereqs()
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
PREREQ=""
|
PREREQ=""
|
||||||
DESCRIPTION="Setting up live session user '$USERNAME'"
|
DESCRIPTION="Setting up live session user '$USERNAME'"
|
||||||
|
|
||||||
[ -r /scripts/casper-functions ] && . /scripts/casper-functions
|
[ -r /scripts/functions ] && . /scripts/functions
|
||||||
|
|
||||||
prereqs()
|
prereqs()
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
PREREQ=""
|
PREREQ=""
|
||||||
DESCRIPTION="Setting up system keymap"
|
DESCRIPTION="Setting up system keymap"
|
||||||
|
|
||||||
[ -r /scripts/casper-functions ] && . /scripts/casper-functions
|
[ -r /scripts/functions ] && . /scripts/functions
|
||||||
|
|
||||||
prereqs()
|
prereqs()
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,7 +4,7 @@ PREREQ=""
|
||||||
DESCRIPTION="Setting up /etc/fstab"
|
DESCRIPTION="Setting up /etc/fstab"
|
||||||
FSTAB=${rootmnt}/etc/fstab
|
FSTAB=${rootmnt}/etc/fstab
|
||||||
|
|
||||||
[ -r /scripts/casper-functions ] && . /scripts/casper-functions
|
[ -r /scripts/functions ] && . /scripts/functions
|
||||||
|
|
||||||
prereqs()
|
prereqs()
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,7 +4,7 @@ PREREQ=""
|
||||||
DESCRIPTION="Setting up swap"
|
DESCRIPTION="Setting up swap"
|
||||||
FSTAB=${rootmnt}/etc/fstab
|
FSTAB=${rootmnt}/etc/fstab
|
||||||
|
|
||||||
[ -r /scripts/casper-functions ] && . /scripts/casper-functions
|
[ -r /scripts/functions ] && . /scripts/functions
|
||||||
|
|
||||||
prereqs()
|
prereqs()
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
PREREQ=""
|
PREREQ=""
|
||||||
DESCRIPTION="Setting up system locale"
|
DESCRIPTION="Setting up system locale"
|
||||||
|
|
||||||
[ -r /scripts/casper-functions ] && . /scripts/casper-functions
|
[ -r /scripts/functions ] && . /scripts/functions
|
||||||
|
|
||||||
prereqs()
|
prereqs()
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
PREREQ=""
|
PREREQ=""
|
||||||
DESCRIPTION="Setting up automatic login"
|
DESCRIPTION="Setting up automatic login"
|
||||||
|
|
||||||
|
[ -r /scripts/functions ] && . /scripts/functions
|
||||||
|
|
||||||
prereqs()
|
prereqs()
|
||||||
{
|
{
|
||||||
echo "$PREREQ"
|
echo "$PREREQ"
|
||||||
|
@ -16,8 +18,6 @@ prereqs)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
. /scripts/casper-functions
|
|
||||||
|
|
||||||
log_begin_msg "$DESCRIPTION"
|
log_begin_msg "$DESCRIPTION"
|
||||||
|
|
||||||
# Enable autologin for getty(1).
|
# Enable autologin for getty(1).
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
PREREQ=""
|
PREREQ=""
|
||||||
DESCRIPTION="Setting up hostname"
|
DESCRIPTION="Setting up hostname"
|
||||||
|
|
||||||
[ -r /scripts/casper-functions ] && . /scripts/casper-functions
|
[ -r /scripts/functions ] && . /scripts/functions
|
||||||
|
|
||||||
prereqs()
|
prereqs()
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
PREREQ=""
|
PREREQ=""
|
||||||
DESCRIPTION="Modifying PolicyKit grants for '$USERNAME' user"
|
DESCRIPTION="Modifying PolicyKit grants for '$USERNAME' user"
|
||||||
|
|
||||||
|
[ -r /scripts/functions ] && . /scripts/functions
|
||||||
|
|
||||||
prereqs()
|
prereqs()
|
||||||
{
|
{
|
||||||
echo "$PREREQ"
|
echo "$PREREQ"
|
||||||
|
@ -16,8 +18,6 @@ prereqs)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
. /scripts/casper-functions
|
|
||||||
|
|
||||||
# Check that polkit is installed.
|
# Check that polkit is installed.
|
||||||
if [ ! -x "/root/usr/libexec/polkitd" ]; then
|
if [ ! -x "/root/usr/libexec/polkitd" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'xbps-casper'
|
# Template file for 'xbps-casper'
|
||||||
pkgname=xbps-casper
|
pkgname=xbps-casper
|
||||||
_localver=0.12 # XBPS package version
|
_localver=0.13 # XBPS package version
|
||||||
_distver=1.236 # This should match the upstream (Ubuntu) version
|
_distver=1.236 # This should match the upstream (Ubuntu) version
|
||||||
version=${_localver}.${_distver}
|
version=${_localver}.${_distver}
|
||||||
build_style=custom-install
|
build_style=custom-install
|
||||||
|
|
Loading…
Reference in a new issue