From 015ae16bf211893a9f50714f9f6141e82ce5e99c Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 17 Feb 2017 15:51:50 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 2 +- .../{layman.cfg.dist.new => layman.cfg.dist} | 102 ++++++++++++++++- layman/layman.cfg | 103 +++++++++++++++++- portage/repos.conf/layman.conf | 2 +- 4 files changed, 198 insertions(+), 11 deletions(-) rename config-archive/etc/layman/{layman.cfg.dist.new => layman.cfg.dist} (62%) diff --git a/.etckeeper b/.etckeeper index a5bb92c..d48a0a0 100755 --- a/.etckeeper +++ b/.etckeeper @@ -184,7 +184,7 @@ maybe chmod 0644 'config-archive/etc/hosts' maybe chmod 0644 'config-archive/etc/hosts.dist' maybe chmod 0755 'config-archive/etc/layman' maybe chmod 0644 'config-archive/etc/layman/layman.cfg' -maybe chmod 0644 'config-archive/etc/layman/layman.cfg.dist.new' +maybe chmod 0644 'config-archive/etc/layman/layman.cfg.dist' maybe chmod 0644 'config-archive/etc/locale.gen' maybe chmod 0644 'config-archive/etc/locale.gen.dist.new' maybe chmod 0644 'config-archive/etc/logrotate.conf' diff --git a/config-archive/etc/layman/layman.cfg.dist.new b/config-archive/etc/layman/layman.cfg.dist similarity index 62% rename from config-archive/etc/layman/layman.cfg.dist.new rename to config-archive/etc/layman/layman.cfg.dist index e5c7c72..ce872a3 100644 --- a/config-archive/etc/layman/layman.cfg.dist.new +++ b/config-archive/etc/layman/layman.cfg.dist @@ -15,6 +15,11 @@ cache : %(storage)s/cache installed: %(storage)s/installed.xml +#----------------------------------------------------------- +# Prompt the user if they are installing unofficial overlays + +check_official : Yes + # This has been renamed from the following # old name : value use it for updating to new one above # local_list: %(storage)s/overlays.xml @@ -22,12 +27,58 @@ installed: %(storage)s/installed.xml # or edit the value above to the current name of your # installed overlay(s) file. +##### Repo Config Options ##### +#----------------------------------------------------------- +# Defines whether or not a repos.conf or make.conf file is +# required for the repository control group. Set to No for +# non-package manager involved repository control. For normal +# portage overlay use and function, this needs to be set to +# Yes. If yes, it requires at least one conf_type to be set. + +require_repoconfig : Yes + #----------------------------------------------------------- # Path to the make.conf file that should be modified by # layman make_conf : %(storage)s/make.conf +#----------------------------------------------------------- +# Path to the repos.conf file that should be modified by +# layman + +repos_conf : /etc/portage/repos.conf/layman.conf + +#----------------------------------------------------------- +# Defines whether or not auto_sync will be set to "yes" or +# "no" in your repos.conf config. Ultimately deciding whether +# or not the portage sync plug-in will automatically sync your +# layman overlays. + +auto_sync : Yes + +#----------------------------------------------------------- +# Repository config types used by layman +# (repos.conf, make.conf) + +conf_type : repos.conf + +#----------------------------------------------------------- + +#### Database Config Options #### #### COMING SOON #### +#----------------------------------------------------------- +# Database types used by layman, only one should be specified. +# (xml, json, sqlite) +#db_type : xml + +#----------------------------------------------------------- + +#----------------------------------------------------------- +# Protocols used by layman when adding overlays or updating +# their URLs. +# ex.) protocol_filter : git, http, https, etc,... +# protocol_filter : + #----------------------------------------------------------- # URLs of the remote lists of overlays (one per line) or # local overlay definitions @@ -36,8 +87,43 @@ make_conf : %(storage)s/make.conf # http://dev.gentoo.org/~wrobel/layman/global-overlays.xml # http://mydomain.org/my-layman-list.xml # file:///var/lib/layman/my-list.xml +# +#### GPG signed lists #### COMING SOON TO A DOWNLOAD SITE NEAR YOU ##### +# +# gpg_signed_lists : +# These can be clearsigned or signed (compressed) overlay lists +# Each url will be one complete file to download, verify, decrypt. +# layman will automatically verify and decrypt the list before saving +# One url per line, indented +# +# e.g.: +# gpg_signed_lists : +# http://someserver.somewhere.com/someoverlays.xml.asc +# +gpg_signed_lists : + +# +# gpg_detached_lists: +# These url's involve downloading 2 files +# The first url listed will be the overlays xml list. +# The second url will be the detached signature file +# with one of {.gpg, .asc, .sig} extension +# Both url's must be on the same line space separated and indented +# +# e.g.: +# gpg_detached_lists : +# http://distfiles.gentoo.org/overlays.xml http://distfiles.gentoo.org/overlays.xml.asc +# http://someserver.somewhere.com/someoverlays.xml http://someserver.somewhere.com/someoverlays.xml.gpg + +gpg_detached_lists : +# https://api.gentoo.org/overlays/repositories.xml https://api.gentoo.org/overlays/repositories.xml.asc + +# original unsigned lists and definitions +# one url per line, indented -overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml +overlays : + https://api.gentoo.org/overlays/repositories.xml + http://www.uhu-banane.de/gentoo/overlay-repos.xml #----------------------------------------------------------- # The directory to scan for xml overlay definition files to include @@ -50,9 +136,10 @@ overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml #----------------------------------------------------------- # Proxy support -# If unset, layman will use the http_proxy environment variable. +# If unset, layman will use the http_proxy/https_proxy environment variable. # -#proxy : http://[user:pass@]www.my-proxy.org:3128 +#http_proxy : http://[user:pass@]www.my-proxy.org:3128 +#https_proxy : https://[user:pass@]www.my-proxy.org:3128 #----------------------------------------------------------- # Strict checking of overlay definitions @@ -126,9 +213,12 @@ news_reporter: portage #git_command : /usr/bin/git #mercurial_command : /usr/bin/hg #rsync_command : /usr/bin/rsync +#left intentionally blank since squashfs only needs to +#mount the squashfs image. +#squashfs-command : #svn_command : /usr/bin/svn #tar_command : /bin/tar -#g-common_command : /usr/bin/g-common +#g-sorcery_command : /usr/bin/g-sorcery #----------------------------------------------------------- @@ -136,6 +226,7 @@ news_reporter: portage # # These commnad options will be added to the above commands # when the overlay is added or synced. +# Use spaces to separate command line arguments # # note: there are some options hardcoded in the backend # scripts already. All VCS types listed here are @@ -164,6 +255,8 @@ news_reporter: portage #svn_syncopts : #g-common_generateopts : #g-common_syncopts : +#g-sorcery_generateopts : +#g-sorcery_syncopts : #----------------------------------------------------------- @@ -187,6 +280,7 @@ news_reporter: portage #svn_postsync : #tar_postsync : #g-common_postsync : +#g-sorcery_postsync : #----------------------------------------------------------- diff --git a/layman/layman.cfg b/layman/layman.cfg index cfa0169..ce872a3 100644 --- a/layman/layman.cfg +++ b/layman/layman.cfg @@ -15,6 +15,11 @@ cache : %(storage)s/cache installed: %(storage)s/installed.xml +#----------------------------------------------------------- +# Prompt the user if they are installing unofficial overlays + +check_official : Yes + # This has been renamed from the following # old name : value use it for updating to new one above # local_list: %(storage)s/overlays.xml @@ -22,12 +27,58 @@ installed: %(storage)s/installed.xml # or edit the value above to the current name of your # installed overlay(s) file. +##### Repo Config Options ##### +#----------------------------------------------------------- +# Defines whether or not a repos.conf or make.conf file is +# required for the repository control group. Set to No for +# non-package manager involved repository control. For normal +# portage overlay use and function, this needs to be set to +# Yes. If yes, it requires at least one conf_type to be set. + +require_repoconfig : Yes + #----------------------------------------------------------- # Path to the make.conf file that should be modified by # layman make_conf : %(storage)s/make.conf +#----------------------------------------------------------- +# Path to the repos.conf file that should be modified by +# layman + +repos_conf : /etc/portage/repos.conf/layman.conf + +#----------------------------------------------------------- +# Defines whether or not auto_sync will be set to "yes" or +# "no" in your repos.conf config. Ultimately deciding whether +# or not the portage sync plug-in will automatically sync your +# layman overlays. + +auto_sync : Yes + +#----------------------------------------------------------- +# Repository config types used by layman +# (repos.conf, make.conf) + +conf_type : repos.conf + +#----------------------------------------------------------- + +#### Database Config Options #### #### COMING SOON #### +#----------------------------------------------------------- +# Database types used by layman, only one should be specified. +# (xml, json, sqlite) +#db_type : xml + +#----------------------------------------------------------- + +#----------------------------------------------------------- +# Protocols used by layman when adding overlays or updating +# their URLs. +# ex.) protocol_filter : git, http, https, etc,... +# protocol_filter : + #----------------------------------------------------------- # URLs of the remote lists of overlays (one per line) or # local overlay definitions @@ -36,9 +87,43 @@ make_conf : %(storage)s/make.conf # http://dev.gentoo.org/~wrobel/layman/global-overlays.xml # http://mydomain.org/my-layman-list.xml # file:///var/lib/layman/my-list.xml +# +#### GPG signed lists #### COMING SOON TO A DOWNLOAD SITE NEAR YOU ##### +# +# gpg_signed_lists : +# These can be clearsigned or signed (compressed) overlay lists +# Each url will be one complete file to download, verify, decrypt. +# layman will automatically verify and decrypt the list before saving +# One url per line, indented +# +# e.g.: +# gpg_signed_lists : +# http://someserver.somewhere.com/someoverlays.xml.asc +# +gpg_signed_lists : + +# +# gpg_detached_lists: +# These url's involve downloading 2 files +# The first url listed will be the overlays xml list. +# The second url will be the detached signature file +# with one of {.gpg, .asc, .sig} extension +# Both url's must be on the same line space separated and indented +# +# e.g.: +# gpg_detached_lists : +# http://distfiles.gentoo.org/overlays.xml http://distfiles.gentoo.org/overlays.xml.asc +# http://someserver.somewhere.com/someoverlays.xml http://someserver.somewhere.com/someoverlays.xml.gpg + +gpg_detached_lists : +# https://api.gentoo.org/overlays/repositories.xml https://api.gentoo.org/overlays/repositories.xml.asc + +# original unsigned lists and definitions +# one url per line, indented -overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml - http://www.uhu-banane.de/gentoo/overlay-repos.xml +overlays : + https://api.gentoo.org/overlays/repositories.xml + http://www.uhu-banane.de/gentoo/overlay-repos.xml #----------------------------------------------------------- # The directory to scan for xml overlay definition files to include @@ -51,9 +136,10 @@ overlays : http://www.gentoo.org/proj/en/overlays/repositories.xml #----------------------------------------------------------- # Proxy support -# If unset, layman will use the http_proxy environment variable. +# If unset, layman will use the http_proxy/https_proxy environment variable. # -#proxy : http://[user:pass@]www.my-proxy.org:3128 +#http_proxy : http://[user:pass@]www.my-proxy.org:3128 +#https_proxy : https://[user:pass@]www.my-proxy.org:3128 #----------------------------------------------------------- # Strict checking of overlay definitions @@ -127,9 +213,12 @@ news_reporter: portage #git_command : /usr/bin/git #mercurial_command : /usr/bin/hg #rsync_command : /usr/bin/rsync +#left intentionally blank since squashfs only needs to +#mount the squashfs image. +#squashfs-command : #svn_command : /usr/bin/svn #tar_command : /bin/tar -#g-common_command : /usr/bin/g-common +#g-sorcery_command : /usr/bin/g-sorcery #----------------------------------------------------------- @@ -137,6 +226,7 @@ news_reporter: portage # # These commnad options will be added to the above commands # when the overlay is added or synced. +# Use spaces to separate command line arguments # # note: there are some options hardcoded in the backend # scripts already. All VCS types listed here are @@ -165,6 +255,8 @@ news_reporter: portage #svn_syncopts : #g-common_generateopts : #g-common_syncopts : +#g-sorcery_generateopts : +#g-sorcery_syncopts : #----------------------------------------------------------- @@ -188,6 +280,7 @@ news_reporter: portage #svn_postsync : #tar_postsync : #g-common_postsync : +#g-sorcery_postsync : #----------------------------------------------------------- diff --git a/portage/repos.conf/layman.conf b/portage/repos.conf/layman.conf index 04cd00f..365fcc6 100644 --- a/portage/repos.conf/layman.conf +++ b/portage/repos.conf/layman.conf @@ -1,4 +1,4 @@ -[alfred] +[alfreds-schatzkiste] priority = 50 location = /var/lib/layman/alfred layman-type = git -- 2.39.5