kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ADDING fixperms in POSTinst instead of PREinst, FIXING acl mountpoint detection on cryptsetup and ext4 systems

This commit is contained in:
Benjamin Sonntag 2012-11-18 08:42:31 +00:00
parent fcdaa86e47
commit b03001e212
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -404,6 +404,7 @@ bureau/locales/fr_FR/LC_MESSAGES/alternc -text
bureau/locales/fr_FR/LC_MESSAGES/manual.po -text bureau/locales/fr_FR/LC_MESSAGES/manual.po -text
bureau/locales/fr_FR/LC_MESSAGES/messages.po -text bureau/locales/fr_FR/LC_MESSAGES/messages.po -text
bureau/locales/it_IT/LC_MESSAGES/alternc -text bureau/locales/it_IT/LC_MESSAGES/alternc -text
bureau/locales/it_IT/LC_MESSAGES/alternc.mo -text
bureau/locales/it_IT/LC_MESSAGES/manual.po -text bureau/locales/it_IT/LC_MESSAGES/manual.po -text
bureau/locales/it_IT/LC_MESSAGES/messages.po -text bureau/locales/it_IT/LC_MESSAGES/messages.po -text
bureau/locales/manual.pot -text bureau/locales/manual.pot -text

BIN
bureau/locales/it_IT/LC_MESSAGES/alternc.mo Normal file
View File

Binary file not shown.

8
debian/alternc.config vendored
View File

@ -181,11 +181,11 @@ LOCATION="$RET"
#checking acl and quota activation, does't work with NFS yet. should now work with lxc #checking acl and quota activation, does't work with NFS yet. should now work with lxc
MOUNT_POINT=$(df -P ${LOCATION%/*} | tail -n 1 | awk '{print $6}') MOUNT_POINT=$(df -P ${LOCATION%/*} | tail -n 1 | awk '{print $6}')
# Get the mount options for the path:$ # Get the mount options for the path: (warning, / may have multiple declarations, take the last one only :
MOUNT_OPTS=$(awk '$2=="'$MOUNT_POINT'" { print $4 }' /proc/mounts) MOUNT_OPTS=$(awk '$2=="'$MOUNT_POINT'" { print $4 }' /proc/mounts | tail -1)
# Check to see if acl is one of the mount points:$ # Check to see if acl is one of the mount points:
ACL="$(echo "$MOUNT_OPTS" | tr "," "\\n" | egrep '^acl|attr2$')" || true ACL="$(echo "$MOUNT_OPTS" | tr "," "\\n" | egrep '^acl|attr2|user_xattr$')" || true
if [ -z "$ACL" ]; then if [ -z "$ACL" ]; then
db_input critical alternc/acluninstalled || true db_input critical alternc/acluninstalled || true

4
debian/alternc.postinst vendored
View File

@ -250,9 +250,11 @@ EOF
echo "copy content of /usr/share/doc/examples/example.sudoers into /etc/sudoers.d for to run properly" echo "copy content of /usr/share/doc/examples/example.sudoers into /etc/sudoers.d for to run properly"
fi fi
# important: postinst freezes withtout that: # important: postinst freezes without that:
db_stop db_stop
# instead of preinst, we launch it here :
/usr/lib/alternc/fixperms.sh
echo "**********************************************" echo "**********************************************"
echo "* ALTERNC: *" echo "* ALTERNC: *"
echo "* Please run alternc.install to fully deploy *" echo "* Please run alternc.install to fully deploy *"

8
debian/alternc.preinst vendored
View File

@ -18,10 +18,10 @@ case "$1" in
upgrade) upgrade)
# Set correct rights on files # Set correct rights on files
echo "/!\ Warning /!\ Defaults ACL will be applied" # echo "/!\ Warning /!\ Defaults ACL will be applied"
echo "If error, please remount $ALTERNC_LOC with ACL" # echo "If error, please remount $ALTERNC_LOC with ACL"
echo "and re-run /usr/lib/alternc/fixperms.sh " # echo "and re-run /usr/lib/alternc/fixperms.sh "
/usr/lib/alternc/fixperms.sh # /usr/lib/alternc/fixperms.sh
if dpkg --compare-versions "$2" lt "0.9.4"; then if dpkg --compare-versions "$2" lt "0.9.4"; then
echo "Upgrading bind configuration" echo "Upgrading bind configuration"

2
debian/control vendored
View File

@ -10,7 +10,7 @@ Standards-Version: 3.9.1
Package: alternc Package: alternc
Architecture: all Architecture: all
Pre-depends: debconf (>= 0.5.00) | debconf-2.0 Pre-depends: debconf (>= 0.5.00) | debconf-2.0
Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, bind9, wget, rsync, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), sudo, adduser, mysql-client, dnsutils, bash (>= 4), acl, dovecot-common (>= 1:1.2.15), dovecot-imapd, dovecot-pop3d, vlogger, mailx Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, bind9, wget, rsync, ca-certificates, locales, perl-suid | perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), sudo, adduser, mysql-client, dnsutils, bash (>= 4), acl, dovecot-common (>= 1:1.2.15), dovecot-imapd, dovecot-pop3d, vlogger, mailx
Recommends: mysql-server(>= 5.0), ntp, quota Recommends: mysql-server(>= 5.0), ntp, quota
Conflicts: alternc-admintools, alternc-awstats (< 1.0), alternc-webalizer (<= 0.9.4), alternc-mailman (< 2.0) Conflicts: alternc-admintools, alternc-awstats (< 1.0), alternc-webalizer (<= 0.9.4), alternc-mailman (< 2.0)
Provides: alternc-admintools Provides: alternc-admintools