diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-02-20 19:20:26 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-02-20 19:20:26 (GMT) |
| commit | 4f7dc32892bc30b0a9d96ccb835732e8ec93d068 (patch) | |
| tree | a04dd8b73e142a3b44e48e295fa0c0b856658e6b | |
| parent | fb738dcd97003951d354d981b2062602de63c649 (diff) | |
| parent | 4fb9b4e5fbf9dbf9d4ed494318a27116dd17d8e1 (diff) | |
| download | linhes_pkgbuild-4f7dc32892bc30b0a9d96ccb835732e8ec93d068.zip linhes_pkgbuild-4f7dc32892bc30b0a9d96ccb835732e8ec93d068.tar.gz linhes_pkgbuild-4f7dc32892bc30b0a9d96ccb835732e8ec93d068.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git
Conflicts:
abs/core-testing/tweaker/bin/twk_general.pl
Fix merge conflicts
| -rwxr-xr-x | abs/core-testing/tweaker/bin/create-linhes-sql.sh | 1 | ||||
| -rwxr-xr-x | abs/core-testing/tweaker/bin/twk_general.pl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/abs/core-testing/tweaker/bin/create-linhes-sql.sh b/abs/core-testing/tweaker/bin/create-linhes-sql.sh index 1f3a379..478eed0 100755 --- a/abs/core-testing/tweaker/bin/create-linhes-sql.sh +++ b/abs/core-testing/tweaker/bin/create-linhes-sql.sh @@ -131,6 +131,7 @@ echo "INSERT INTO settings VALUES ('BackendServerIP','127.0.0.1','MythTVhost');" echo "INSERT INTO settings VALUES ('MasterServerIP','127.0.0.1','MythTVhost');" >> $LINHES_SQL_PROTOTYPE echo "INSERT INTO settings VALUES ('MasterServerPort','6543','MythTVhost');" >> $LINHES_SQL_PROTOTYPE echo "INSERT INTO settings VALUES ('Theme', 'LinHES','MythTVhost');" >> $LINHES_SQL_PROTOTYPE +echo "INSERT INTO settings VALUES ('HostMyhostname', 'type_hostname_here','MythTVhost');" >> $LINHES_SQL_PROTOTYPE echo "INSERT INTO storagegroup VALUES ('\N', 'Default','MythTVhost','/');" >> $LINHES_SQL_PROTOTYPE rm $TMPFILE diff --git a/abs/core-testing/tweaker/bin/twk_general.pl b/abs/core-testing/tweaker/bin/twk_general.pl index fa419e2..8ebc1f0 100755 --- a/abs/core-testing/tweaker/bin/twk_general.pl +++ b/abs/core-testing/tweaker/bin/twk_general.pl @@ -361,6 +361,7 @@ sub implement_option { # change_or_make_setting('Hostpluginmythvideo_dvdcss','0'); # change_or_make_setting('Hostpluginmythvodka','1'); # change_or_make_setting('Hostpluginmythweather','1'); +# change_or_make_setting('Hostaccessuser','1'); change_or_make_setting('JobAllowCommFlag', '1'); change_or_make_setting('JobAllowTranscode', '1'); change_or_make_setting('JobAllowUserJob1', '1'); |