From 3b28797a23d17cdf9960b0661516c262a8284354 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 27 Feb 2009 10:34:01 -0600 Subject: Add new modules fe_restart.py. Whitespace cleanup --- abs/mv-core/func/PKGBUILD | 6 +++--- abs/mv-core/func/fe_restart.py | 35 +++++++++++++++++++++++++++++++++++ abs/mv-core/func/power.py | 8 ++++---- 3 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 abs/mv-core/func/fe_restart.py diff --git a/abs/mv-core/func/PKGBUILD b/abs/mv-core/func/PKGBUILD index 9e4a598..96eafce 100644 --- a/abs/mv-core/func/PKGBUILD +++ b/abs/mv-core/func/PKGBUILD @@ -1,6 +1,6 @@ pkgname=func pkgver=0.24 -pkgrel=9 +pkgrel=21 pkgdesc="fedora unifed network controller" url="" license="gpl" @@ -11,13 +11,12 @@ replaces=() backup=() moddir="pkg/usr/lib/python2.6/site-packages/func/minion/modules/" install=func.install -source=($pkgname-$pkgver.tar.gz minion.conf power.py pacman.py failed_func.sh) +source=($pkgname-$pkgver.tar.gz minion.conf power.py pacman.py failed_func.sh fe_restart.py) md5sums=() arch=('i686') build() { cd $startdir/src/$pkgname-${pkgver} - cd $startdir/src/func python setup.py build python setup.py install --prefix=$startdir/pkg/usr cd $startdir/src @@ -27,6 +26,7 @@ build() { install -m755 -D $startdir/src/$pkgname-${pkgver}/etc/Test.conf $startdir/pkg/etc/func/modules/Test.conf install -m755 -D $startdir/src/power.py ${startdir}/${moddir}/power.py install -m755 -D $startdir/src/pacman.py ${startdir}/${moddir}/pacman.py + install -m755 -D $startdir/src/fe_restart.py ${startdir}/${moddir}/fe_restart.py install -m755 -D $startdir/src/failed_func.sh $startdir/pkg/usr/bin/failed_func.sh mkdir -p $startdir/pkg/var/log/func cd $startdir/pkg diff --git a/abs/mv-core/func/fe_restart.py b/abs/mv-core/func/fe_restart.py new file mode 100644 index 0000000..a75b0c5 --- /dev/null +++ b/abs/mv-core/func/fe_restart.py @@ -0,0 +1,35 @@ +## +# other modules +import sub_process + +# our modules +import func_module + +# ================================= + +class re_restart(func_module.FuncModule): + + version = "0.0.1" + api_version = "0.0.1" + description = "Restart the frontend" + + def killX (self,flags="restart frontend"): + """ + Restart X + """ + flags.replace(";","") # prevent stupidity + cmd = sub_process.Popen("/sbin/sv %s " % flags,stdout=sub_process.PIPE,shell=True) + data = cmd.communicate()[0] + results = ['Restarted UI'] + return (cmd.returncode, results) + + def killmyth (self,flags="-9 mythfrontend"): + """ + kill the mythfrontend process server + """ + flags.replace(";","") # prevent stupidity + cmd = sub_process.Popen("/usr/bin/killall %s" % flags,stdout=sub_process.PIPE,shell=True) + data = cmd.communicate()[0] + results = ['killed mythfrontend'] + return (cmd.returncode, results) + diff --git a/abs/mv-core/func/power.py b/abs/mv-core/func/power.py index 297f464..668965a 100644 --- a/abs/mv-core/func/power.py +++ b/abs/mv-core/func/power.py @@ -16,9 +16,9 @@ class power(func_module.FuncModule): def reboot(self,flags="-q onecheck"): """ Reboot the server - """ + """ flags.replace(";","") # prevent stupidity - cmd = sub_process.Popen("/sbin/reboot") + cmd = sub_process.Popen("/sbin/reboot") data = cmd.communicate()[0] results = ['reboot'] return (cmd.returncode, results) @@ -26,9 +26,9 @@ class power(func_module.FuncModule): def poweroff (self,flags="-q onecheck"): """ Reboot the server - """ + """ flags.replace(";","") # prevent stupidity - cmd = sub_process.Popen("/sbin/poweroff") + cmd = sub_process.Popen("/sbin/poweroff") data = cmd.communicate()[0] results = ['off'] return (cmd.returncode, results) -- cgit v0.12 From ff391b5a2ecf9b873836c587606ec58e5c18943c Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 27 Feb 2009 10:34:25 -0600 Subject: Add web option for fe_restart to local website. --- abs/mv-core/hobbitmon/PKGBUILD | 2 +- abs/mv-core/hobbitmon/hbnotes.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/mv-core/hobbitmon/PKGBUILD b/abs/mv-core/hobbitmon/PKGBUILD index e2a9484..cb71a60 100755 --- a/abs/mv-core/hobbitmon/PKGBUILD +++ b/abs/mv-core/hobbitmon/PKGBUILD @@ -1,7 +1,7 @@ pkgname=hobbitserver provides=hobbit pkgver=4.2.0 -pkgrel=102 +pkgrel=103 pkgdesc="Hobbit is a system for monitoring servers and networks. " license="GPL" arch=('i686') diff --git a/abs/mv-core/hobbitmon/hbnotes.py b/abs/mv-core/hobbitmon/hbnotes.py index 087b646..5300e88 100755 --- a/abs/mv-core/hobbitmon/hbnotes.py +++ b/abs/mv-core/hobbitmon/hbnotes.py @@ -297,7 +297,7 @@ def main(argv):
Restart interface: - -- cgit v0.12 From b70cf779699270766389918fd3169488fd21671f Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 27 Feb 2009 10:34:55 -0600 Subject: white space cleanups and fe_restart option to process.py. --- abs/mv-core/local-website/PKGBUILD | 2 +- abs/mv-core/local-website/contents/process.py | 53 ++++++++++++++------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/abs/mv-core/local-website/PKGBUILD b/abs/mv-core/local-website/PKGBUILD index 5ecee78..2358cf5 100755 --- a/abs/mv-core/local-website/PKGBUILD +++ b/abs/mv-core/local-website/PKGBUILD @@ -1,6 +1,6 @@ pkgname=local-website pkgver=3 -pkgrel=78 +pkgrel=82 pkgdesc="Local website for MythVantage " arch=(i686 x86_64) #depends=('lighttpd') diff --git a/abs/mv-core/local-website/contents/process.py b/abs/mv-core/local-website/contents/process.py index eb70caa..b390440 100755 --- a/abs/mv-core/local-website/contents/process.py +++ b/abs/mv-core/local-website/contents/process.py @@ -40,32 +40,22 @@ def getform(theform, valuelist, notpresent='', nolist=False): """ data = {} for field in valuelist: - - if not theform.has_key(field): # if the field is not present (or was empty) data[field] = notpresent - else: # the field is present - - - print type(theform[field]) - + print type(theform[field]) if type(theform[field]) != type([]): # is it a list or a single item - print type(theform[field]) + print type(theform[field]) data[field] = theform[field].value - else: - if not nolist: # do we want a list ? data[field] = theform.getlist(field) - else: data[field] = theform.getfirst(field) - # just fetch the first item return data @@ -119,12 +109,8 @@ def go_backup(myhost): cmd=' "sudo /etc/cron.daily/backup_cron ; sudo su nobody -c /data/srv/hobbit/server/ext/hbnotes.py"' command=sshcmd + cmd + " 2>&1 " results=os.popen(command,'r') - #print command - - return results - def go_restore(restorefile,myhost): myhostname = socket.gethostname() if myhostname.strip() == myhost.strip(): @@ -171,7 +157,7 @@ def go_updateall(allupdate_type): cmd+=allupdate_type command= cmd + " 2>&1 " results=os.popen(command,'r') - return results + return results def go_shutdown(myhost): @@ -216,16 +202,15 @@ def go_shutdownall(): def go_reboot(myhost): myhostname = socket.gethostname() if myhostname.strip() == myhost.strip(): - message="Reboot from MBE:::ALT" - os.system("/usr/bin/osdClient.pl " + myhost.strip() + " 5000 " + "\"" + message + "\"" ) - time.sleep(3) + message="Reboot from MBE:::ALT" + os.system("/usr/bin/osdClient.pl " + myhost.strip() + " 5000 " + "\"" + message + "\"" ) + time.sleep(3) command="sudo /sbin/reboot " else: command="sudo /usr/bin/func \"" + myhost.strip() + "*\ call power reboot " - message="Reboot from MBE:::ALT" - os.system("/usr/bin/osdClient.pl " + myhost.strip() + " 5000 " + "\"" + message + "\"" ) - time.sleep(3) - + message="Reboot from MBE:::ALT" + os.system("/usr/bin/osdClient.pl " + myhost.strip() + " 5000 " + "\"" + message + "\"" ) + time.sleep(3) results=os.popen(command,'r') return results @@ -234,6 +219,19 @@ def go_wake(myhost): results=os.popen(command,'r') return results +def go_kill(myhost,kill_type): + myhostname = socket.gethostname() + if myhostname.strip() == myhost.strip(): + cmd="sudo /usr/bin/update_systemno_op " + command=cmd + kill_type + else: + cmd=" call fe_restart " + cmd+=kill_type + command="sudo /usr/bin/func \"" + myhost.strip() + "*\" " + cmd + print command + results=os.popen(command,'r') + return results + mainpage = ''' @@ -249,7 +247,7 @@ error = ''' result = '''

%s of %s

''' -possible_parameters = ['param1', 'param2', 'param3', 'param4','hiddenparam','param5'] +possible_parameters = ['param1', 'param2', 'param3', 'param4','hiddenparam','param5','param6'] if __name__ == '__main__': cgiprint(contentheader) # content header @@ -270,7 +268,8 @@ if __name__ == '__main__': update_type = formdict['param3'] oldurl = formdict['param4'] hidden = formdict['hiddenparam'] - all_update_type=formdict['param5'] + all_update_type=formdict['param5'] + kill_type = formdict['param6'] body = result % (radio, hidden) @@ -298,6 +297,8 @@ if __name__ == '__main__': mylogfile=go_updateall(all_update_type) elif selection == "ShutdownAll": mylogfile=go_shutdownall() + elif selection == "Kill": + mylogfile=go_kill(myhost,kill_type) box='''
-- cgit v0.12 From 5c6f0bf13b31d6bde1ab751b6307fc3852c13094 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 27 Feb 2009 10:56:02 -0600 Subject: Finish off fe_restart command for MBE from process.py --- abs/mv-core/local-website/PKGBUILD | 2 +- abs/mv-core/local-website/contents/process.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/abs/mv-core/local-website/PKGBUILD b/abs/mv-core/local-website/PKGBUILD index 2358cf5..e0b2380 100755 --- a/abs/mv-core/local-website/PKGBUILD +++ b/abs/mv-core/local-website/PKGBUILD @@ -1,6 +1,6 @@ pkgname=local-website pkgver=3 -pkgrel=82 +pkgrel=85 pkgdesc="Local website for MythVantage " arch=(i686 x86_64) #depends=('lighttpd') diff --git a/abs/mv-core/local-website/contents/process.py b/abs/mv-core/local-website/contents/process.py index b390440..99404a4 100755 --- a/abs/mv-core/local-website/contents/process.py +++ b/abs/mv-core/local-website/contents/process.py @@ -222,13 +222,15 @@ def go_wake(myhost): def go_kill(myhost,kill_type): myhostname = socket.gethostname() if myhostname.strip() == myhost.strip(): - cmd="sudo /usr/bin/update_systemno_op " - command=cmd + kill_type + if kill_type == "killX": + command="sudo /sbin/sv restart frontend" + else: + command="sudo /usr/bin/killall -9 mythfrontend" else: cmd=" call fe_restart " cmd+=kill_type command="sudo /usr/bin/func \"" + myhost.strip() + "*\" " + cmd - print command + #print command results=os.popen(command,'r') return results -- cgit v0.12 From 40d3532388150d2671228651edffc8392dcf485e Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 27 Feb 2009 10:56:58 -0600 Subject: update sudo commands for nobody. Hopefully this will be the last and going forward remote and local hosts will be treated the same. --- abs/mv-core/MythVantage-system/PKGBUILD | 2 +- abs/mv-core/MythVantage-system/STB.install | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/abs/mv-core/MythVantage-system/PKGBUILD b/abs/mv-core/MythVantage-system/PKGBUILD index 12ba99e..7a43e64 100644 --- a/abs/mv-core/MythVantage-system/PKGBUILD +++ b/abs/mv-core/MythVantage-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=MythVantage-system pkgver=1.0 -pkgrel=4 +pkgrel=9 arch=('i686') MVDIR=$startdir/pkg/usr/MythVantage BINDIR=$startdir/pkg/usr/bin diff --git a/abs/mv-core/MythVantage-system/STB.install b/abs/mv-core/MythVantage-system/STB.install index 135663e..e4d8c63 100644 --- a/abs/mv-core/MythVantage-system/STB.install +++ b/abs/mv-core/MythVantage-system/STB.install @@ -39,8 +39,10 @@ LINE14="nobody ALL = NOPASSWD: /sbin/sv stop dnsmasq" LINE15="nobody ALL = NOPASSWD: /sbin/sv start dnsmasq" LINE16="nobody ALL = NOPASSWD: /sbin/sv hup dnsmasq" LINE17="mythtv ALL =(ALL) NOPASSWD: ALL" +LINE18="nobody ALL = NOPASSWD: /sbin/sv start frontend" +LINE19="nobody ALL = NOPASSWD: /usr/bin/killall -9 mythfrontend" -for i in "$LINE" "$LINE1" "$LINE2" "$LINE3" "$LINE4" "$LINE5" "$LINE7" "$LINE8" "$LINE9" "$LINE10" "$LINE11" "$LINE12" "$LINE13" "$LINE14" "$LINE15" "$LINE16" "$LINE17" +for i in "$LINE" "$LINE1" "$LINE2" "$LINE3" "$LINE4" "$LINE5" "$LINE7" "$LINE8" "$LINE9" "$LINE10" "$LINE11" "$LINE12" "$LINE13" "$LINE14" "$LINE15" "$LINE16" "$LINE17" "$LINE18" "$LINE19" do cp /etc/sudoers /etc/sudoers.bak grep -q "$i" /etc/sudoers -- cgit v0.12 From 741757159ddcfb0de035f61379a2f799f45a4c62 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 27 Feb 2009 13:11:13 -0600 Subject: Corrected the help text to match the keybindings.. Closes FS#209 requires rebuild of mythvantage. --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 11b1a55..7682002 100755 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=286 +pkgrel=287 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan ) -- cgit v0.12 From 0cef2678162d3e3cfe0d3c4267254b92c54ddc69 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 27 Feb 2009 13:28:02 -0600 Subject: Corrected path for some programs Added -L as a default argument for dhcpcd. Closes FS#213 and FS#215 --- abs/core-testing/etcnet/10-defaults | 3 +++ abs/core-testing/etcnet/PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/abs/core-testing/etcnet/10-defaults b/abs/core-testing/etcnet/10-defaults index 3eb9024..5897a89 100644 --- a/abs/core-testing/etcnet/10-defaults +++ b/abs/core-testing/etcnet/10-defaults @@ -1,6 +1,9 @@ DHCP_CLIENT=/sbin/dhcpcd +DHCP_ARGS=-L IP=/usr/sbin/ip TC=/usr/sbin/tc LSMOD=/bin/lsmod IFGROUP[1]='eth wlan plip usb dvb bnep tuntap' IFRENAME=/usr/sbin/ifrename +IPTABLES=/usr/sbin/iptables +IP6TABLES=/usr/sbin/ip6tables diff --git a/abs/core-testing/etcnet/PKGBUILD b/abs/core-testing/etcnet/PKGBUILD index bc69c83..39e1378 100755 --- a/abs/core-testing/etcnet/PKGBUILD +++ b/abs/core-testing/etcnet/PKGBUILD @@ -1,6 +1,6 @@ pkgname=etcnet pkgver=0.9.7 -pkgrel=9 +pkgrel=10 pkgdesc="/etc/net network configuration subsystem" url="http://etcnet.org/" depends=('bash' 'grep' 'sed' 'iproute' 'wireless_tools' 'iptables' 'dhcpcd') -- cgit v0.12 From 9828f9a5ca4c0b65c7d7dd2d7de9ee909ecaa6dd Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 27 Feb 2009 14:19:32 -0600 Subject: Reworked the order for things in xconfig. REF FS#238. This does not fix 238, but it was discovered while looking at it. The bug reported in 238 does not appear to exisit. --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/xconfig.sh | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 7682002..cea9c1c 100755 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=287 +pkgrel=290 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan ) diff --git a/abs/core-testing/LinHES-config/xconfig.sh b/abs/core-testing/LinHES-config/xconfig.sh index eaa84b6..e2a48ed 100755 --- a/abs/core-testing/LinHES-config/xconfig.sh +++ b/abs/core-testing/LinHES-config/xconfig.sh @@ -5,6 +5,7 @@ BASE="" . /etc/profile NVIDIA_96XX="$TEMPLATES/xorg/96xx_supported.txt" #TEMPLATES="/usr/share/templates" +MYTHHOME=$BASE/home/mythtv function Xvalues { CMDLINE=$(cat /proc/cmdline) @@ -23,29 +24,31 @@ function Xvalues { } function presetupX { - if [ "$XUseAdvanced" = 1 ] + if [ -f /etc/sysconfig/IGNORE_X ] then + echo "Will not run xconfig.sh due to presence of /etc/sysconfig/IGNORE_X" + return 1 + else if [ "$XIgnoreConfig" = 1 ] then echo "Using User supplied X" - if [ -f "$BASE/data/home/mythtv/templates/xorg.user" ] + if [ -f "$MYTHHOME/templates/xorg.user" ] then - cp -f "$BASE/data/home/mythtv/templates/xorg.user" "$XORG_CONF" + cp -f "$MYTHHOME/templates/xorg.user" "$XORG_CONF" else echo "Didn't find the file" - echo "Copy your config file to $BASE/data/home/mythtv/templates/xorg.use" >> "$XORG_CONF" + echo "Copy your config file to $MYTHHOME/templates/xorg.user" > "$XORG_CONF" fi else - setupAdvancedX - fi - else - if [ -f /etc/sysconfig/IGNORE_X ] - then - echo "Will not run xconfig.sh due to presence of /etc/sysconfig/IGNORE_X" - else - setupX + if [ "$XUseAdvanced" = 1 ] + then + setupAdvancedX + else + setupX + fi fi fi + } function setupAdvancedX { -- cgit v0.12 From f8de853dd6ca2b9f5bd5494e34973eab89e40fa5 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 27 Feb 2009 15:40:48 -0600 Subject: create dir for func/certmaster logging. --- abs/mv-core/MythVantage-config/PKGBUILD | 2 +- abs/mv-core/MythVantage-config/install_proxy.sh | 6 +++- abs/mv-core/certmaster/PKGBUILD | 5 ++- abs/mv-core/certmaster/certmaster.install | 46 +++++++++++++++++++++++++ abs/mv-core/func/PKGBUILD | 2 +- abs/mv-core/func/func.install | 11 ++++-- 6 files changed, 64 insertions(+), 8 deletions(-) create mode 100755 abs/mv-core/certmaster/certmaster.install diff --git a/abs/mv-core/MythVantage-config/PKGBUILD b/abs/mv-core/MythVantage-config/PKGBUILD index 885e51d..d59299e 100755 --- a/abs/mv-core/MythVantage-config/PKGBUILD +++ b/abs/mv-core/MythVantage-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=MythVantage-config pkgver=3.2 -pkgrel=151 +pkgrel=152 pkgdesc="The Gui-installer" depends=(bc mysql-python expect curl dnsutils sg3_utils parted) arch=('i686') diff --git a/abs/mv-core/MythVantage-config/install_proxy.sh b/abs/mv-core/MythVantage-config/install_proxy.sh index d0be6c3..84b397e 100755 --- a/abs/mv-core/MythVantage-config/install_proxy.sh +++ b/abs/mv-core/MythVantage-config/install_proxy.sh @@ -106,7 +106,9 @@ full_install () { cp -f $MV_ROOT/bin/*.sh "$mountpoint"$MV_ROOT/bin/ chmod -R 755 ${mountpoint}/root cp /etc/mtab "$mountpoint"/etc/mtab - apply_new_auth + apply_new_auth + mkdir -p $mountpoint/var/log/func + mkdir -p $mountpoint/var/log/certmaster if [ $SystemType = "Master_backend" -o $SystemType = "Standalone" ] then @@ -222,6 +224,8 @@ function upgrade () { chmod -R 755 ${mountpoint}/root chown root:mythtv "$mountpoint"/etc/systemconfig chmod 775 "$mountpoint"/etc/systemconfig + mkdir -p $mountpoint/var/log/func + mkdir -p $mountpoint/var/log/certmaster #mount /proc and /dev mount --bind /dev "$mountpoint/dev" mount --bind /proc "$mountpoint/proc" diff --git a/abs/mv-core/certmaster/PKGBUILD b/abs/mv-core/certmaster/PKGBUILD index 96b8d2c..8158bd7 100644 --- a/abs/mv-core/certmaster/PKGBUILD +++ b/abs/mv-core/certmaster/PKGBUILD @@ -1,6 +1,6 @@ pkgname=certmaster pkgver=0.24 -pkgrel=5 +pkgrel=6 pkgdesc="certmaster" url="" license="gpl" @@ -8,11 +8,10 @@ depends=(pyopenssl) makedepends=() conflicts=() replaces=() -backup=() moddir="pkg/usr/lib/python2.5/site-packages/func/minion/modules/" backup=('etc/certmaster/certmaster.conf' 'etc/certmaster/minion.conf') - +install=certmaster.install source=($pkgname-$pkgver.tar.gz certmaster.conf minion.conf) md5sums=() arch=('i686') diff --git a/abs/mv-core/certmaster/certmaster.install b/abs/mv-core/certmaster/certmaster.install new file mode 100755 index 0000000..98c9215 --- /dev/null +++ b/abs/mv-core/certmaster/certmaster.install @@ -0,0 +1,46 @@ +# This is a default template for a post-install scriptlet. You can +# remove any functions you don't need (and this header). + +# arg 1: the new package version +pre_install() { +/bin/true +mkdir -p /var/log/certmaster +} + +# arg 1: the new package version +post_install() { + if [ ! -e /var/log/certmaster ] + then + mkdir -p /var/log/certmaster + fi + +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + /bin/true + + + +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install +} + +# arg 1: the old package version +pre_remove() { + /bin/true +} + +# arg 1: the old package version +post_remove() { + /bin/true +} + +op=$1 +shift +$op $* diff --git a/abs/mv-core/func/PKGBUILD b/abs/mv-core/func/PKGBUILD index 96eafce..5dc03d6 100644 --- a/abs/mv-core/func/PKGBUILD +++ b/abs/mv-core/func/PKGBUILD @@ -1,6 +1,6 @@ pkgname=func pkgver=0.24 -pkgrel=21 +pkgrel=22 pkgdesc="fedora unifed network controller" url="" license="gpl" diff --git a/abs/mv-core/func/func.install b/abs/mv-core/func/func.install index a1d42f8..5f0fa72 100755 --- a/abs/mv-core/func/func.install +++ b/abs/mv-core/func/func.install @@ -4,6 +4,7 @@ # arg 1: the new package version pre_install() { /bin/true +mkdir -p /var/log/func } # arg 1: the new package version @@ -12,9 +13,15 @@ post_install() { then mkdir /etc/cron.tenminutes fi + if [ ! -e /etc/cron.tenminutes/failed_func.sh ] + then + ln -s /usr/bin/failed_func.sh /etc/cron.tenminutes/failed_func.sh + fi - ln -s /usr/bin/failed_func.sh /etc/cron.tenminutes/failed_func.sh - + if [ ! -e /var/log/func ] + then + mkdir -p /var/log/func + fi } -- cgit v0.12 From 2702cde8aa327363a6a24caf55e3f041d6a2232e Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 27 Feb 2009 15:41:05 -0600 Subject: correct typo for nobody sudo permissions. --- abs/mv-core/MythVantage-system/PKGBUILD | 2 +- abs/mv-core/MythVantage-system/STB.install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/mv-core/MythVantage-system/PKGBUILD b/abs/mv-core/MythVantage-system/PKGBUILD index 7a43e64..d8b7315 100644 --- a/abs/mv-core/MythVantage-system/PKGBUILD +++ b/abs/mv-core/MythVantage-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=MythVantage-system pkgver=1.0 -pkgrel=9 +pkgrel=10 arch=('i686') MVDIR=$startdir/pkg/usr/MythVantage BINDIR=$startdir/pkg/usr/bin diff --git a/abs/mv-core/MythVantage-system/STB.install b/abs/mv-core/MythVantage-system/STB.install index e4d8c63..2dbfd19 100644 --- a/abs/mv-core/MythVantage-system/STB.install +++ b/abs/mv-core/MythVantage-system/STB.install @@ -39,7 +39,7 @@ LINE14="nobody ALL = NOPASSWD: /sbin/sv stop dnsmasq" LINE15="nobody ALL = NOPASSWD: /sbin/sv start dnsmasq" LINE16="nobody ALL = NOPASSWD: /sbin/sv hup dnsmasq" LINE17="mythtv ALL =(ALL) NOPASSWD: ALL" -LINE18="nobody ALL = NOPASSWD: /sbin/sv start frontend" +LINE18="nobody ALL = NOPASSWD: /sbin/sv restart frontend" LINE19="nobody ALL = NOPASSWD: /usr/bin/killall -9 mythfrontend" for i in "$LINE" "$LINE1" "$LINE2" "$LINE3" "$LINE4" "$LINE5" "$LINE7" "$LINE8" "$LINE9" "$LINE10" "$LINE11" "$LINE12" "$LINE13" "$LINE14" "$LINE15" "$LINE16" "$LINE17" "$LINE18" "$LINE19" -- cgit v0.12