diff options
| -rw-r--r-- | abs/core/LinHES-config/PKGBUILD | 23 | ||||
| -rw-r--r-- | abs/core/LinHES-config/config-sudo.rules | 3 | ||||
| -rw-r--r-- | abs/core/LinHES-config/config.install (renamed from abs/core/LinHES-config/LinHES.install) | 22 |
3 files changed, 17 insertions, 31 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 52303f9..077064c 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -6,7 +6,7 @@ pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' 'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-parted' 'python-pexpect' 'python-netifaces' - 'python-iplib' 'mythinstall>=2-10') + 'python-iplib' 'mythinstall>=2-10' 'sudo') #LinHES-timezone arch=('i686' 'x86_64') @@ -44,12 +44,13 @@ source=(mv_install.py mv_webuser.py mv_hostype.py mv_supplemental.py - systemconfig.py + systemconfig.py myth_user_call.py - mythvantage.cfg) + mythvantage.cfg + config-sudo.rules ) backup=(etc/mythvantage.cfg) -install=LinHES.install +install=config.install build() { mkdir -p $startdir/pkg/etc @@ -62,8 +63,7 @@ build() { mkdir -p $MVDIR/etc #copy in all the installer specific stuff -# install -m0700 myth_user_call $MVDIR/bin/myth_user_call - install -m0700 myth_user_call.py $MVDIR/bin/myth_user_call + install -m 0700 myth_user_call.py $MVDIR/bin/myth_user_call install -m 0755 install_proxy.sh $MVDIR/bin/install_proxy.sh install -m 0755 install_functions.sh $MVDIR/bin/install_functions.sh install -m 0755 systemconfig.sh $MVDIR/bin/systemconfig.sh @@ -100,11 +100,15 @@ build() { mkdir -p $startdir/pkg/usr/bin install -m 0755 file_time_offset.py $startdir/pkg/usr/bin/file_time_offset.py - #Copy in the branding stuff install -m 0755 LinHES-release $startdir/pkg/etc/LinHES-release - #install -m 0755 issue $startdir/pkg/etc/issue + #sudo rules + mkdir -p $startdir/pkg/etc/sudoers.d/ + chmod 750 $startdir/pkg/etc/sudoers.d/ + chown -R root:root $startdir/pkg/etc/sudoers.d + + install -o root -g root -m 0750 config-sudo.rules $startdir/pkg/etc/sudoers.d/config-sudo.rules } md5sums=('4ef6a2f04f5cb1777ac3772eeccdc78f' '16b98fcb3753ef6cfc35075c326d30e4' @@ -142,4 +146,5 @@ md5sums=('4ef6a2f04f5cb1777ac3772eeccdc78f' '755c05b833aca6c5be130972af052e8b' 'd8f80e5686d02555f044363f1ac17d97' '2596460462cf6c889cf8f95485537b20' - 'a63ff9ef5250965aeabc74bfa8e43981') + 'a63ff9ef5250965aeabc74bfa8e43981' + '4804aa93aaad3dfcfff08cd9ffd68836') diff --git a/abs/core/LinHES-config/config-sudo.rules b/abs/core/LinHES-config/config-sudo.rules new file mode 100644 index 0000000..67d5aba --- /dev/null +++ b/abs/core/LinHES-config/config-sudo.rules @@ -0,0 +1,3 @@ +mythtv ALL = NOPASSWD:/usr/MythVantage/bin/mythvantage +mythtv ALL = NOPASSWD:/usr/MythVantage/bin/MythVantage + diff --git a/abs/core/LinHES-config/LinHES.install b/abs/core/LinHES-config/config.install index fb967aa..fb905fb 100644 --- a/abs/core/LinHES-config/LinHES.install +++ b/abs/core/LinHES-config/config.install @@ -15,28 +15,6 @@ post_install() { echo "List of packages to ignore" > /etc/blacklist.package echo "one package per line" >> /etc/blacklist.package fi - -LINE="mythtv ALL = NOPASSWD:/usr/MythVantage/bin/mythvantage" -LINE1="mythtv ALL = NOPASSWD:/usr/MythVantage/bin/MythVantage" - for i in "$LINE" "$LINE1" - do - cp /etc/sudoers /etc/sudoers.bak - grep -q "$i" /etc/sudoers - if [ $? != 0 ] - then - echo "$i" >> /etc/sudoers - visudo -cf /etc/sudoers - if [ ! $? = 0 ] - then - cp /etc/sudoers.bak /etc/sudoers - echo $i - echo "Error adding files" - exit 1 - fi - fi - done - - } # arg 1: the new package version |