From: Frank Brehm Date: Tue, 5 Nov 2013 23:49:47 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=61fe90a133b91f6a7e4e69a2ee1e6386cc9ffd56;p=config%2Fuhu1%2Fetc.git Current state --- diff --git a/.etckeeper b/.etckeeper index 0f31528..5cd9ec1 100755 --- a/.etckeeper +++ b/.etckeeper @@ -15,7 +15,6 @@ mkdir -p './php/embed-php5.5/ext' mkdir -p './php/embed-php5.5/ext-active' mkdir -p './php/fpm-php5.5/ext' mkdir -p './php/fpm-php5.5/ext-active' -mkdir -p './request-key.d' mkdir -p './salt/pki/minions_pre' mkdir -p './salt/pki/minions_rejected' mkdir -p './security/limits.d' @@ -33,7 +32,6 @@ mkdir -p './unixODBC/ODBCDataSources' maybe chmod 0755 '.' maybe chmod 0700 './.etckeeper' maybe chmod 0644 './.gitignore' -maybe chmod 0600 './.pwd.lock' maybe chmod 0644 './DIR_COLORS' maybe chmod 0644 './GeoIP.conf' maybe chmod 0755 './ImageMagick-6' @@ -147,7 +145,7 @@ maybe chgrp 'named' './bind/rndc.key' maybe chmod 0640 './bind/rndc.key' maybe chmod 0755 './ca-certificates' maybe chmod 0644 './ca-certificates.conf' -maybe chmod 0755 './ca-certificates/update.d' +maybe chmod 0755 './cifs-utils' maybe chmod 0644 './clamd.conf' maybe chmod 0644 './colordiffrc' maybe chmod 0644 './colordiffrc-lightbg' @@ -206,6 +204,7 @@ maybe chmod 0644 './conf.d/slapd' maybe chmod 0644 './conf.d/smartd' maybe chmod 0644 './conf.d/snmpd' maybe chmod 0644 './conf.d/snmptrapd' +maybe chmod 0644 './conf.d/sntp' maybe chmod 0644 './conf.d/spamd' maybe chmod 0644 './conf.d/sshd' maybe chmod 0644 './conf.d/staticroute' @@ -273,8 +272,10 @@ maybe chmod 0660 './config-archive/etc/courier/authlib/authdaemonrc' maybe chmod 0660 './config-archive/etc/courier/authlib/authdaemonrc.dist' maybe chmod 0660 './config-archive/etc/courier/authlib/authdaemonrc.dist.dist' maybe chmod 0755 './config-archive/etc/cron.daily' +maybe chmod 0755 './config-archive/etc/cron.daily/logrotate' maybe chmod 0755 './config-archive/etc/cron.daily/logrotate.cron' maybe chmod 0755 './config-archive/etc/cron.daily/logrotate.cron.dist.new' +maybe chmod 0755 './config-archive/etc/cron.daily/logrotate.dist.new' maybe chmod 0755 './config-archive/etc/cups' maybe chmod 0640 './config-archive/etc/cups/cupsd.conf' maybe chmod 0640 './config-archive/etc/cups/cupsd.conf.default' @@ -701,12 +702,11 @@ maybe chmod 0755 './dbus-1/system.d' maybe chmod 0644 './dbus-1/system.d/.keep_sys-apps_dbus-0' maybe chmod 0644 './dbus-1/system.d/cups.conf' maybe chmod 0755 './default' +maybe chmod 0644 './default/grub' maybe chmod 0600 './default/useradd' maybe chmod 0644 './dhcpcd.conf' maybe chmod 0644 './dispatch-conf.conf' -maybe chmod 0644 './dmtab' maybe chmod 0755 './dpkg' -maybe chmod 0755 './dpkg/dpkg.cfg.d' maybe chmod 0644 './drirc' maybe chmod 0644 './e2fsck.conf' maybe chmod 0755 './eclean' @@ -755,7 +755,7 @@ maybe chmod 0644 './env.d/binutils/config-x86_64-pc-linux-gnu' maybe chmod 0644 './env.d/binutils/x86_64-pc-linux-gnu-2.23.1' maybe chmod 0755 './env.d/gcc' maybe chmod 0644 './env.d/gcc/config-x86_64-pc-linux-gnu' -maybe chmod 0644 './env.d/gcc/x86_64-pc-linux-gnu-4.6.3' +maybe chmod 0644 './env.d/gcc/x86_64-pc-linux-gnu-4.7.3' maybe chmod 0755 './env.d/python' maybe chmod 0644 './env.d/python/.keep_app-admin_eselect-python-0' maybe chmod 0644 './env.d/python/config' @@ -825,12 +825,15 @@ maybe chmod 0755 './fonts' maybe chmod 0755 './fonts/conf.avail' maybe chmod 0644 './fonts/conf.avail/10-autohint.conf' maybe chmod 0644 './fonts/conf.avail/10-no-sub-pixel.conf' +maybe chmod 0644 './fonts/conf.avail/10-scale-bitmap-fonts.conf' maybe chmod 0644 './fonts/conf.avail/10-sub-pixel-bgr.conf' maybe chmod 0644 './fonts/conf.avail/10-sub-pixel-rgb.conf' maybe chmod 0644 './fonts/conf.avail/10-sub-pixel-vbgr.conf' maybe chmod 0644 './fonts/conf.avail/10-sub-pixel-vrgb.conf' maybe chmod 0644 './fonts/conf.avail/10-unhinted.conf' -maybe chmod 0644 './fonts/conf.avail/20-fix-globaladvance.conf' +maybe chmod 0644 './fonts/conf.avail/11-lcdfilter-default.conf' +maybe chmod 0644 './fonts/conf.avail/11-lcdfilter-legacy.conf' +maybe chmod 0644 './fonts/conf.avail/11-lcdfilter-light.conf' maybe chmod 0644 './fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf' maybe chmod 0644 './fonts/conf.avail/20-unhint-small-dejavu-sans.conf' maybe chmod 0644 './fonts/conf.avail/20-unhint-small-dejavu-serif.conf' @@ -859,7 +862,6 @@ maybe chmod 0644 './fonts/conf.avail/99pdftoopvp.conf' maybe chmod 0755 './fonts/conf.d' maybe chmod 0644 './fonts/conf.d/README' maybe chmod 0644 './fonts/fonts.conf' -maybe chmod 0644 './fonts/fonts.dtd' maybe chmod 0755 './foomatic' maybe chmod 0755 './foomatic/direct' maybe chmod 0644 './foomatic/filter.conf' @@ -886,6 +888,14 @@ maybe chmod 0644 './gpm/gpm-syn.conf' maybe chmod 0644 './gpm/gpm-twiddler.conf' maybe chmod 0644 './group' maybe chmod 0600 './group-' +maybe chmod 0755 './grub.d' +maybe chmod 0755 './grub.d/00_header' +maybe chmod 0755 './grub.d/10_linux' +maybe chmod 0755 './grub.d/20_linux_xen' +maybe chmod 0755 './grub.d/30_os-prober' +maybe chmod 0755 './grub.d/40_custom' +maybe chmod 0755 './grub.d/41_custom' +maybe chmod 0644 './grub.d/README' maybe chmod 0400 './gshadow' maybe chmod 0600 './gshadow-' maybe chmod 0644 './gssapi_mech.conf' @@ -958,7 +968,6 @@ maybe chmod 0755 './init.d/mit-krb5kdc' maybe chmod 0755 './init.d/mit-krb5kpropd' maybe chmod 0755 './init.d/modules' maybe chmod 0755 './init.d/mount-ro' -maybe chmod 0755 './init.d/mtab' maybe chmod 0755 './init.d/mysql' maybe chmod 0755 './init.d/nagios' maybe chmod 0755 './init.d/named' @@ -996,6 +1005,7 @@ maybe chmod 0755 './init.d/slapd' maybe chmod 0755 './init.d/smartd' maybe chmod 0755 './init.d/snmpd' maybe chmod 0755 './init.d/snmptrapd' +maybe chmod 0755 './init.d/sntp' maybe chmod 0755 './init.d/spamd' maybe chmod 0755 './init.d/sshd' maybe chmod 0755 './init.d/stunnel' @@ -1050,7 +1060,6 @@ maybe chmod 0755 './layman' maybe chmod 0644 './layman/layman.cfg' maybe chmod 0755 './layman/overlays' maybe chmod 0644 './layman/overlays/.keep_app-portage_layman-0' -maybe chmod 0644 './ld.so.cache' maybe chmod 0644 './ld.so.conf' maybe chmod 0755 './ld.so.conf.d' maybe chmod 0644 './ld.so.conf.d/05binutils.conf' @@ -1081,17 +1090,13 @@ maybe chmod 0755 './logwatch' maybe chmod 0644 './logwatch/.keep_sys-apps_logwatch-0' maybe chmod 0755 './lvm' maybe chmod 0700 './lvm/archive' -maybe chmod 0600 './lvm/archive/vg00_00000.vg' maybe chmod 0700 './lvm/backup' -maybe chmod 0600 './lvm/backup/vg00' maybe chmod 0700 './lvm/cache' -maybe chmod 0600 './lvm/cache/.cache' maybe chmod 0644 './lvm/lvm.conf' maybe chmod 0644 './machine-id' maybe chmod 0755 './mail' maybe chmod 0644 './mail/.gitignore' maybe chmod 0644 './mail/aliases' -maybe chmod 0644 './mail/aliases.db' maybe chmod 0755 './mail/spamassassin' maybe chmod 0644 './mail/spamassassin/init.pre' maybe chmod 0644 './mail/spamassassin/local.cf' @@ -1125,9 +1130,6 @@ maybe chmod 0644 './mlocate-cron.conf' maybe chmod 0755 './modprobe.d' maybe chmod 0644 './modprobe.d/aliases.conf' maybe chmod 0644 './modprobe.d/i386.conf' -maybe chmod 0644 './motd' -maybe chmod 0644 './motd.tail' -maybe chmod 0644 './mtab' maybe chmod 0755 './mutt' maybe chmod 0644 './mutt/Muttrc' maybe chmod 0644 './mutt/Muttrc.dist' @@ -1284,6 +1286,7 @@ maybe chmod 0644 './pam.d/start-stop-daemon' maybe chmod 0644 './pam.d/su' maybe chmod 0644 './pam.d/sudo' maybe chmod 0644 './pam.d/system-auth' +maybe chmod 0644 './pam.d/system-auth-winbind' maybe chmod 0644 './pam.d/system-local-login' maybe chmod 0644 './pam.d/system-login' maybe chmod 0644 './pam.d/system-remote-login' @@ -1409,7 +1412,6 @@ maybe chgrp 'postgrey' './postfix/postgrey_whitelist_recipients' maybe chmod 0640 './postfix/postgrey_whitelist_recipients' maybe chmod 0600 './postfix/saslpass' maybe chmod 0644 './postfix/smtp_auth' -maybe chmod 0644 './postfix/smtp_auth.db' maybe chmod 0755 './postgresql-9.1' maybe chown 'postgres' './postgresql-9.1/pg_hba.conf' maybe chgrp 'postgres' './postgresql-9.1/pg_hba.conf' @@ -1452,6 +1454,8 @@ maybe chmod 0644 './reoback/files.conf' maybe chmod 0644 './reoback/settings.conf' maybe chmod 0644 './request-key.conf' maybe chmod 0755 './request-key.d' +maybe chmod 0644 './request-key.d/cifs.idmap.conf' +maybe chmod 0644 './request-key.d/cifs.upcall.conf' maybe chmod 0644 './resolv.conf' maybe chmod 0755 './revdep-rebuild' maybe chmod 0644 './revdep-rebuild/60-java' @@ -1501,6 +1505,7 @@ maybe chmod 0644 './security/namespace.conf' maybe chmod 0755 './security/namespace.d' maybe chmod 0755 './security/namespace.init' maybe chmod 0644 './security/pam_env.conf' +maybe chmod 0644 './security/pam_winbind.conf' maybe chmod 0644 './security/time.conf' maybe chmod 0755 './sensors.d' maybe chmod 0644 './sensors3.conf' @@ -1636,6 +1641,14 @@ maybe chmod 0644 './syslog-ng/syslog-ng.conf' maybe chmod 0644 './syslog-ng/syslog-ng.conf.orig' maybe chmod 0644 './sysstat' maybe chmod 0644 './sysstat.ioconf' +maybe chmod 0755 './systemd' +maybe chmod 0755 './systemd/system' +maybe chmod 0755 './systemd/system/ntpdate.service.d' +maybe chmod 0644 './systemd/system/ntpdate.service.d/00gentoo.conf' +maybe chmod 0755 './systemd/system/slapd.service.d' +maybe chmod 0644 './systemd/system/slapd.service.d/00gentoo.conf' +maybe chmod 0755 './systemd/system/sntp.service.d' +maybe chmod 0644 './systemd/system/sntp.service.d/00gentoo.conf' maybe chmod 0755 './t1lib' maybe chmod 0644 './t1lib/t1lib.config' maybe chmod 0755 './terminfo' @@ -1662,7 +1675,6 @@ maybe chmod 0644 './terminfo/x/xterm-color' maybe chmod 0644 './terminfo/x/xterm-xfree86' maybe chmod 0755 './texmf' maybe chmod 0755 './texmf/dvipdfm' -maybe chmod 0755 './texmf/dvipdfm/config' maybe chmod 0755 './texmf/dvipdfmx' maybe chmod 0644 './texmf/dvipdfmx/dvipdfmx.cfg' maybe chmod 0755 './texmf/dvips.d' diff --git a/cifs-utils/idmap-plugin b/cifs-utils/idmap-plugin new file mode 120000 index 0000000..36886ea --- /dev/null +++ b/cifs-utils/idmap-plugin @@ -0,0 +1 @@ +/usr/lib64/cifs-utils/idmapwb.so \ No newline at end of file diff --git a/conf.d/sntp b/conf.d/sntp new file mode 100644 index 0000000..d11983a --- /dev/null +++ b/conf.d/sntp @@ -0,0 +1,4 @@ +# /etc/conf.d/sntp + +# Options to pass to sntp +SNTP_OPTS="-s 0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" diff --git a/conf.d/spamd b/conf.d/spamd index b6fca03..b3cd1ac 100644 --- a/conf.d/spamd +++ b/conf.d/spamd @@ -38,7 +38,7 @@ SPAMD_OPTS="-m 5 -c -H" # spamd stores its pid in this file. If you use the -u option to # run spamd under another user, you might need to adjust it. -PIDFILE="/var/run/spamd.pid" +PIDFILE="/run/spamd.pid" # SPAMD_NICELEVEL lets you set the 'nice'ness of the running # spamd process diff --git a/config-archive/etc/cron.daily/logrotate b/config-archive/etc/cron.daily/logrotate new file mode 100755 index 0000000..0a16a38 --- /dev/null +++ b/config-archive/etc/cron.daily/logrotate @@ -0,0 +1,11 @@ +#!/bin/sh + +#/usr/sbin/logrotate /etc/logrotate.conf +if [ -x /usr/scripts/logrotate.pl ] ; then + /usr/scripts/logrotate.pl -v >>/var/log/logrotate.log + EXITVALUE=$? + if [ $EXITVALUE != 0 ]; then + /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]" + fi +fi +exit 0 diff --git a/config-archive/etc/cron.daily/logrotate.dist.new b/config-archive/etc/cron.daily/logrotate.dist.new new file mode 100755 index 0000000..c6d50d4 --- /dev/null +++ b/config-archive/etc/cron.daily/logrotate.dist.new @@ -0,0 +1,8 @@ +#!/bin/sh + +/usr/sbin/logrotate /etc/logrotate.conf +EXITVALUE=$? +if [ $EXITVALUE != 0 ]; then + /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]" +fi +exit 0 diff --git a/courier-imap/imapd-ssl b/courier-imap/imapd-ssl index ee723ac..be0fb3f 100644 --- a/courier-imap/imapd-ssl +++ b/courier-imap/imapd-ssl @@ -1,4 +1,4 @@ -##VERSION: $Id: imapd-ssl.dist.in,v 1.21 2008/07/12 20:17:24 mrsam Exp $ +##VERSION: $Id: imapd-ssl.dist.in,v 1.22 2009/08/12 22:25:49 mrsam Exp $ # # imapd-ssl created from imapd-ssl.dist by sysconftool # @@ -147,7 +147,7 @@ COURIERTLS=/usr/sbin/couriertls # # OpenSSL: # -# TLS_CIPHER_LIST="SSLv3:TLSv1:!SSLv2:HIGH:!LOW:!MEDIUM:!EXP:!NULL@STRENGTH" +# TLS_CIPHER_LIST="SSLv3:TLSv1:!SSLv2:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH" # # To enable SSL2, remove the obvious "!SSLv2" part from the above list. # diff --git a/courier-imap/pop3d-ssl b/courier-imap/pop3d-ssl index 56f55d2..472fa52 100644 --- a/courier-imap/pop3d-ssl +++ b/courier-imap/pop3d-ssl @@ -1,4 +1,4 @@ -##VERSION: $Id: pop3d-ssl.dist.in,v 1.22 2008/07/12 20:17:25 mrsam Exp $ +##VERSION: $Id: pop3d-ssl.dist.in,v 1.23 2009/08/12 22:25:49 mrsam Exp $ # # pop3d-ssl created from pop3d-ssl.dist by sysconftool # @@ -134,7 +134,7 @@ TLS_STARTTLS_PROTOCOL=TLS1 # # OpenSSL: # -# TLS_CIPHER_LIST="SSLv3:TLSv1:!SSLv2:HIGH:!LOW:!MEDIUM:!EXP:!NULL@STRENGTH" +# TLS_CIPHER_LIST="SSLv3:TLSv1:!SSLv2:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH" # # To enable SSL2, remove the obvious "!SSLv2" part from the above list. # diff --git a/cups/cups-browsed.conf b/cups/cups-browsed.conf index 57d2deb..c006e55 100644 --- a/cups/cups-browsed.conf +++ b/cups/cups-browsed.conf @@ -22,5 +22,10 @@ BrowseRemoteProtocols DNSSD,CUPS # Use BrowsePoll to poll a particular CUPS server # BrowsePoll cups.example.com # BrowsePoll cups.example.com:631 +# BrowsePoll cups.example.com:631/version=1.1 + +# Use DomainSocket to access the local CUPS daemon via another than the +# default domain socket +# DomainSocket /var/lib/run/cups/cups.sock # Unknown directives are ignored, also unknown values. diff --git a/cups/cups-files.conf b/cups/cups-files.conf index 9edfd39..8dea2f5 100644 --- a/cups/cups-files.conf +++ b/cups/cups-files.conf @@ -1,5 +1,5 @@ # -# "$Id: cups-files.conf.in 10765 2012-12-13 20:36:17Z mike $" +# "$Id: cups-files.conf.in 11221 2013-08-06 16:16:01Z msweet $" # # Sample file/directory/user/group configuration file for the CUPS scheduler. # See "man cups-files.conf" for a complete description of this file. @@ -8,6 +8,9 @@ # List of events that are considered fatal errors for the scheduler... #FatalErrors config +# Do we call fsync() after writing configuration or status files? +#SyncOnClose No + # Default user and group for filters/backends/helper programs; this cannot be # any user or group that resolves to ID 0 for security reasons... #User lp @@ -94,5 +97,5 @@ PageLog /var/log/cups/page_log #TempDir /var/spool/cups/tmp # -# End of "$Id: cups-files.conf.in 10765 2012-12-13 20:36:17Z mike $". +# End of "$Id: cups-files.conf.in 11221 2013-08-06 16:16:01Z msweet $". # diff --git a/cups/cupsd.conf b/cups/cupsd.conf index 43280df..d3ac323 100644 --- a/cups/cupsd.conf +++ b/cups/cupsd.conf @@ -1,5 +1,5 @@ # -# "$Id: cupsd.conf.in 10710 2012-11-26 18:26:01Z mike $" +# "$Id: cupsd.conf.in 11173 2013-07-23 12:31:34Z msweet $" # # Sample configuration file for the CUPS scheduler. See "man cupsd.conf" for a # complete description of this file. @@ -130,5 +130,5 @@ WebInterface Yes # -# End of "$Id: cupsd.conf.in 10710 2012-11-26 18:26:01Z mike $". +# End of "$Id: cupsd.conf.in 11173 2013-07-23 12:31:34Z msweet $". # diff --git a/cups/snmp.conf b/cups/snmp.conf index 5539d50..17d376e 100644 --- a/cups/snmp.conf +++ b/cups/snmp.conf @@ -1,5 +1,5 @@ # -# "$Id: snmp.conf.in 9045 2010-03-24 07:48:42Z mike $" +# "$Id: snmp.conf.in 11173 2013-07-23 12:31:34Z msweet $" # # Sample SNMP configuration file for CUPS. See "man cups-snmp.conf" for a # complete description of this file. @@ -9,5 +9,5 @@ Address @LOCAL Community public # -# End of "$Id: snmp.conf.in 9045 2010-03-24 07:48:42Z mike $". +# End of "$Id: snmp.conf.in 11173 2013-07-23 12:31:34Z msweet $". # diff --git a/default/grub b/default/grub new file mode 100644 index 0000000..5075314 --- /dev/null +++ b/default/grub @@ -0,0 +1,46 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.4 2013/09/21 18:10:55 floppym Exp $ +# +# To populate all changes in this file you need to regenerate your +# grub configuration file afterwards: +# 'grub2-mkconfig -o /boot/grub/grub.cfg' +# +# See the grub info page for documentation on possible variables and +# their associated values. + +GRUB_DISTRIBUTOR="Gentoo" + +GRUB_DEFAULT=0 +GRUB_HIDDEN_TIMEOUT=0 +GRUB_HIDDEN_TIMEOUT_QUIET=true +GRUB_TIMEOUT=10 + +# Append parameters to the linux kernel command line +# GRUB_CMDLINE_LINUX="" + +# Append parameters to the linux kernel command line for non-recovery entries +#GRUB_CMDLINE_LINUX_DEFAULT="" + +# Uncomment to disable graphical terminal (grub-pc only) +#GRUB_TERMINAL=console + +# The resolution used on graphical terminal. +# Note that you can use only modes which your graphic card supports via VBE. +# You can see them in real GRUB with the command `vbeinfo'. +#GRUB_GFXMODE=640x480 + +# Path to theme spec txt file. +# The starfield is by default provided with use truetype. +# NOTE: when enabling custom theme, ensure you have required font/etc. +#GRUB_THEME="/boot/grub/themes/starfield/theme.txt" + +# Background image used on graphical terminal. +# Can be in various bitmap formats. +#GRUB_BACKGROUND="/boot/grub/mybackground.png" + +# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel +#GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +#GRUB_DISABLE_RECOVERY=true diff --git a/env.d/gcc/x86_64-pc-linux-gnu-4.6.3 b/env.d/gcc/x86_64-pc-linux-gnu-4.6.3 deleted file mode 100644 index 1f63693..0000000 --- a/env.d/gcc/x86_64-pc-linux-gnu-4.6.3 +++ /dev/null @@ -1,8 +0,0 @@ -LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3:/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/32" -MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/man" -INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.6.3/info" -STDCXX_INCDIR="g++-v4" -CTARGET="x86_64-pc-linux-gnu" -GCC_SPECS="" -MULTIOSDIRS="../lib64:../lib32" -GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3" diff --git a/env.d/gcc/x86_64-pc-linux-gnu-4.7.3 b/env.d/gcc/x86_64-pc-linux-gnu-4.7.3 new file mode 100644 index 0000000..b16f64f --- /dev/null +++ b/env.d/gcc/x86_64-pc-linux-gnu-4.7.3 @@ -0,0 +1,10 @@ +PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.3" +ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.3" +GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.3" +LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.3:/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.3/32" +MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.7.3/man" +INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.7.3/info" +STDCXX_INCDIR="g++-v4" +CTARGET="x86_64-pc-linux-gnu" +GCC_SPECS="" +MULTIOSDIRS="../lib64:../lib32" diff --git a/etckeeper/pre-commit.d/30store-metadata b/etckeeper/pre-commit.d/30store-metadata index 03ce475..fa5b5c6 100755 --- a/etckeeper/pre-commit.d/30store-metadata +++ b/etckeeper/pre-commit.d/30store-metadata @@ -15,16 +15,25 @@ filter_unknown() { } filter_ignore() { - if [ "$VCS" = darcs ]; then - ignorefile=.darcsignore - fi + case "$VCS" in + darcs) ignorefile=.darcsignore ;; + git) ignorefile=.gitignore ;; + esac - if [ "$VCS" = darcs ] && [ -e "$ignorefile" ]; then - patternsfile="$( mktemp -t etckeeper-$VCS.XXXXXXXXXX )" - grep -v '^[[:space:]]*\(#\|$\)' "$ignorefile" > "$patternsfile" || true - grep -Evf "$patternsfile" - rm -f "$patternsfile" - unset patternsfile + if [ -n "$ignorefile" ] && [ -e "$ignorefile" ]; then + listfile="$( mktemp -t etckeeper-$VCS.XXXXXXXXXX )" + case "$VCS" in + darcs) + grep -v '^[[:space:]]*\(#\|$\)' "$ignorefile" > "$listfile" || true + grep -Evf "$listfile" + ;; + git) + git ls-files --others --ignore --exclude-standard --directory > "$listfile" || true + grep -Fvf "$listfile" + ;; + esac + rm -f "$listfile" + unset listfile else cat - fi @@ -74,7 +83,7 @@ generate_metadata() { # Store things that don't have the default user or group. # Store all file modes, in case the user has an unusual umask. - find $NOVCS \( -type f -or -type d \) -print | sort | perl -ne ' + find $NOVCS \( -type f -or -type d \) -print | filter_ignore | sort | perl -ne ' BEGIN { $q=chr(39) } sub uidname { my $want=shift; diff --git a/fonts/conf.avail/10-autohint.conf b/fonts/conf.avail/10-autohint.conf index c597bf4..f9032ba 100644 --- a/fonts/conf.avail/10-autohint.conf +++ b/fonts/conf.avail/10-autohint.conf @@ -2,7 +2,13 @@ - - true + + + true diff --git a/fonts/conf.avail/10-no-sub-pixel.conf b/fonts/conf.avail/10-no-sub-pixel.conf index 87ada4e..cf12465 100644 --- a/fonts/conf.avail/10-no-sub-pixel.conf +++ b/fonts/conf.avail/10-no-sub-pixel.conf @@ -2,7 +2,13 @@ - - none + + + none diff --git a/fonts/conf.avail/10-scale-bitmap-fonts.conf b/fonts/conf.avail/10-scale-bitmap-fonts.conf new file mode 100644 index 0000000..e3bcd46 --- /dev/null +++ b/fonts/conf.avail/10-scale-bitmap-fonts.conf @@ -0,0 +1,81 @@ + + + + + + + false + + + + pixelsize + pixelsize + + + + + + false + + + + + pixelsizefixupfactor + 1.2 + + + pixelsizefixupfactor + 0.8 + + + + + + + + false + + + 64 + + + true + + + true + + + 1.0 + + + + + + false + + + 1.0 + + + + matrix + + pixelsizefixupfactor 0 + 0 pixelsizefixupfactor + + + + + + size + pixelsizefixupfactor + + + + + diff --git a/fonts/conf.avail/10-sub-pixel-bgr.conf b/fonts/conf.avail/10-sub-pixel-bgr.conf index e1f64fd..1378195 100644 --- a/fonts/conf.avail/10-sub-pixel-bgr.conf +++ b/fonts/conf.avail/10-sub-pixel-bgr.conf @@ -2,7 +2,13 @@ - - bgr + + + bgr diff --git a/fonts/conf.avail/10-sub-pixel-rgb.conf b/fonts/conf.avail/10-sub-pixel-rgb.conf index 2b49fe3..757c3b6 100644 --- a/fonts/conf.avail/10-sub-pixel-rgb.conf +++ b/fonts/conf.avail/10-sub-pixel-rgb.conf @@ -2,7 +2,13 @@ - - rgb + + + rgb diff --git a/fonts/conf.avail/10-sub-pixel-vbgr.conf b/fonts/conf.avail/10-sub-pixel-vbgr.conf index 5947650..c807e5c 100644 --- a/fonts/conf.avail/10-sub-pixel-vbgr.conf +++ b/fonts/conf.avail/10-sub-pixel-vbgr.conf @@ -2,7 +2,13 @@ - - vbgr + + + vbgr diff --git a/fonts/conf.avail/10-sub-pixel-vrgb.conf b/fonts/conf.avail/10-sub-pixel-vrgb.conf index 84481bd..b5985e0 100644 --- a/fonts/conf.avail/10-sub-pixel-vrgb.conf +++ b/fonts/conf.avail/10-sub-pixel-vrgb.conf @@ -2,7 +2,13 @@ - - vrgb + + + vrgb diff --git a/fonts/conf.avail/10-unhinted.conf b/fonts/conf.avail/10-unhinted.conf index 025ae2a..a25e3b1 100644 --- a/fonts/conf.avail/10-unhinted.conf +++ b/fonts/conf.avail/10-unhinted.conf @@ -2,7 +2,13 @@ - - false + + + false diff --git a/fonts/conf.avail/11-lcdfilter-default.conf b/fonts/conf.avail/11-lcdfilter-default.conf new file mode 100644 index 0000000..9d7d11f --- /dev/null +++ b/fonts/conf.avail/11-lcdfilter-default.conf @@ -0,0 +1,16 @@ + + + + + + + + lcddefault + + + diff --git a/fonts/conf.avail/11-lcdfilter-legacy.conf b/fonts/conf.avail/11-lcdfilter-legacy.conf new file mode 100644 index 0000000..7e2b256 --- /dev/null +++ b/fonts/conf.avail/11-lcdfilter-legacy.conf @@ -0,0 +1,16 @@ + + + + + + + + lcdlegacy + + + diff --git a/fonts/conf.avail/11-lcdfilter-light.conf b/fonts/conf.avail/11-lcdfilter-light.conf new file mode 100644 index 0000000..0dd0a90 --- /dev/null +++ b/fonts/conf.avail/11-lcdfilter-light.conf @@ -0,0 +1,16 @@ + + + + + + + + lcdlight + + + diff --git a/fonts/conf.avail/20-fix-globaladvance.conf b/fonts/conf.avail/20-fix-globaladvance.conf deleted file mode 100644 index 2a9c063..0000000 --- a/fonts/conf.avail/20-fix-globaladvance.conf +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - GulimChe - false - - - - DotumChe - false - - - - BatangChe - false - - - - GungsuhChe - false - - diff --git a/fonts/conf.avail/20-unhint-small-vera.conf b/fonts/conf.avail/20-unhint-small-vera.conf index c4ebee9..c9505ca 100644 --- a/fonts/conf.avail/20-unhint-small-vera.conf +++ b/fonts/conf.avail/20-unhint-small-vera.conf @@ -10,7 +10,7 @@ --> - + Bitstream Vera Sans @@ -22,7 +22,7 @@ - + Bitstream Vera Serif @@ -34,7 +34,7 @@ - + Bitstream Vera Sans Mono diff --git a/fonts/conf.avail/25-unhint-nonlatin.conf b/fonts/conf.avail/25-unhint-nonlatin.conf index ffb70c6..9adffa7 100644 --- a/fonts/conf.avail/25-unhint-nonlatin.conf +++ b/fonts/conf.avail/25-unhint-nonlatin.conf @@ -5,7 +5,7 @@ - + Kochi Mincho @@ -13,7 +13,7 @@ - + Kochi Gothic @@ -21,7 +21,7 @@ - + Sazanami Mincho @@ -29,7 +29,7 @@ - + Sazanami Gothic @@ -37,7 +37,7 @@ - + Baekmuk Batang @@ -45,7 +45,7 @@ - + Baekmuk Dotum @@ -53,7 +53,7 @@ - + Baekmuk Gulim @@ -61,7 +61,7 @@ - + Baekmuk Headline @@ -69,7 +69,7 @@ - + AR PL Mingti2L Big5 @@ -77,7 +77,7 @@ - + AR PL ShanHeiSun Uni @@ -85,7 +85,7 @@ - + AR PL KaitiM Big5 @@ -93,7 +93,7 @@ - + AR PL ZenKai Uni @@ -101,7 +101,7 @@ - + AR PL SungtiL GB @@ -109,7 +109,7 @@ - + AR PL KaitiM GB @@ -117,7 +117,7 @@ - + ZYSong18030 diff --git a/fonts/conf.avail/30-metric-aliases.conf b/fonts/conf.avail/30-metric-aliases.conf index 702a495..f25052a 100644 --- a/fonts/conf.avail/30-metric-aliases.conf +++ b/fonts/conf.avail/30-metric-aliases.conf @@ -15,10 +15,12 @@ Microsoft fonts: Arial + Arial Narrow Times New Roman Courier New Liberation fonts: Liberation Sans + Liberation Sans Narrow Liberation Serif Liberation Mono StarOffice fonts: @@ -29,10 +31,14 @@ Albany AMT Thorndale AMT Cumberland AMT + Google CrOS Core fonts: + Arimo + Cousine + Tinos Of these, URW fonts are design compatible with PostScrict fonts, - and the Liberation, StarOffice, and AMT ones are compatible with - Microsoft fonts. + and the Liberation, StarOffice, AMT and CrOS Core ones are + compatible with Microsoft fonts. We want for each of them to fallback to any of these available, but in an order preferring similar designs @@ -74,27 +80,91 @@ + + Arimo + + Arial + + + Liberation Sans + + Arial + + + + + Liberation Sans Narrow + + Arial Narrow + + + + Albany + + Arial + + + + Albany AMT Arial + + Tinos + + Times New Roman + + + Liberation Serif + + Times New Roman + + + + Thorndale + + Times New Roman + + + + Thorndale AMT Times New Roman + + Cousine + + Courier New + + + Liberation Mono + + Courier New + + + + Cumberland + + Courier New + + + + Cumberland AMT Courier New @@ -183,27 +253,37 @@ Arial - Liberation Sans - Albany - Albany AMT + Arimo + Liberation Sans + Albany + Albany AMT + + + + + Arial Narrow + + Liberation Sans Narrow Times New Roman - Liberation Serif - Thorndale - Thorndale AMT + Tinos + Liberation Serif + Thorndale + Thorndale AMT Courier New - Liberation Mono - Cumberland - Cumberland AMT + Cousine + Liberation Mono + Cumberland + Cumberland AMT diff --git a/fonts/conf.avail/30-urw-aliases.conf b/fonts/conf.avail/30-urw-aliases.conf index 8d2b04b..aae06ac 100644 --- a/fonts/conf.avail/30-urw-aliases.conf +++ b/fonts/conf.avail/30-urw-aliases.conf @@ -29,12 +29,8 @@ Zapf Dingbats Dingbats - - ZapfDingbats - Dingbats - - + Symbol diff --git a/fonts/conf.avail/40-nonlatin.conf b/fonts/conf.avail/40-nonlatin.conf index a875db0..c900fd4 100644 --- a/fonts/conf.avail/40-nonlatin.conf +++ b/fonts/conf.avail/40-nonlatin.conf @@ -11,58 +11,187 @@ --> Nazli + serif + + Lotoos + serif + + Mitra + serif + + Ferdosi + serif + + Badr + serif + + Zar + serif + + Titr + serif + + Jadid + serif + + Kochi Mincho + serif + + AR PL SungtiL GB + serif + + AR PL Mingti2L Big5 + serif + + ＭＳ 明朝 + serif + + + NanumMyeongjo + serif + + UnBatang + serif + + Baekmuk Batang + serif + + MgOpen Canonica + serif + + Sazanami Mincho + serif + + AR PL ZenKai Uni + serif + + ZYSong18030 + serif + + FreeSerif serif + + SimSun + serif + Arshia + sans-serif + + Elham + sans-serif + + Farnaz + sans-serif + + Nasim + sans-serif + + Sina + sans-serif + + Roya + sans-serif + + Koodak + sans-serif + + Terafik + sans-serif + + Kochi Gothic + sans-serif + + AR PL KaitiM GB + sans-serif + + AR PL KaitiM Big5 + sans-serif + + ＭＳ ゴシック + sans-serif + + + NanumGothic + sans-serif + + UnDotum + sans-serif + + Baekmuk Dotum - SimSun + sans-serif + + MgOpen Modata + sans-serif + + Sazanami Gothic + sans-serif + + AR PL ShanHeiSun Uni + sans-serif + + ZYSong18030 + sans-serif + + FreeSans sans-serif - + NSimSun + monospace + + ZYSong18030 + monospace + + + NanumGothicCoding + monospace + + FreeMono monospace @@ -72,8 +201,17 @@ --> Homa + fantasy + + Kamran + fantasy + + Fantezi + fantasy + + Tabassom fantasy @@ -83,6 +221,9 @@ --> IranNastaliq + cursive + + Nafees Nastaleeq cursive diff --git a/fonts/conf.avail/45-latin.conf b/fonts/conf.avail/45-latin.conf index 7e41264..09fd526 100644 --- a/fonts/conf.avail/45-latin.conf +++ b/fonts/conf.avail/45-latin.conf @@ -11,13 +11,37 @@ --> Bitstream Vera Serif + serif + + DejaVu Serif + serif + + Liberation Serif + serif + + Times New Roman + serif + + Times + serif + + Nimbus Roman No9 L + serif + + Luxi Serif + serif + + Thorndale AMT + serif + + Thorndale serif @@ -26,14 +50,41 @@ --> Bitstream Vera Sans + sans-serif + + DejaVu Sans + sans-serif + + Liberation Sans + sans-serif + + Arial + sans-serif + + Helvetica + sans-serif + + Verdana + sans-serif + + Albany AMT + sans-serif + + Albany + sans-serif + + Nimbus Sans L + sans-serif + + Luxi Sans sans-serif @@ -42,15 +93,45 @@ --> Bitstream Vera Sans Mono + monospace + + DejaVu Sans Mono + monospace + + Liberation Mono + monospace + + Inconsolata + monospace + + Courier New + monospace + + Courier + monospace + + Andale Mono + monospace + + Luxi Mono + monospace + + Cumberland AMT + monospace + + Cumberland + monospace + + Nimbus Mono L monospace @@ -59,8 +140,17 @@ --> Impact + fantasy + + Copperplate Gothic Std + fantasy + + Cooper Std + fantasy + + Bauhaus Std fantasy @@ -69,7 +159,13 @@ --> ITC Zapf Chancery Std + cursive + + Zapfino + cursive + + Comic Sans MS cursive diff --git a/fonts/conf.avail/50-user.conf b/fonts/conf.avail/50-user.conf index 3f89012..07c9182 100644 --- a/fonts/conf.avail/50-user.conf +++ b/fonts/conf.avail/50-user.conf @@ -1,7 +1,15 @@ - - ~/.fonts.conf.d - ~/.fonts.conf + + fontconfig/conf.d + fontconfig/fonts.conf + + ~/.fonts.conf.d + ~/.fonts.conf diff --git a/fonts/conf.avail/65-fonts-persian.conf b/fonts/conf.avail/65-fonts-persian.conf index 0033675..ea00661 100644 --- a/fonts/conf.avail/65-fonts-persian.conf +++ b/fonts/conf.avail/65-fonts-persian.conf @@ -181,7 +181,7 @@ - + Elham @@ -190,7 +190,7 @@ - + Homa @@ -199,7 +199,7 @@ - + Koodak @@ -208,7 +208,7 @@ - + Nazli @@ -217,7 +217,7 @@ - + Roya @@ -226,7 +226,7 @@ - + Terafik @@ -235,7 +235,7 @@ - + Titr diff --git a/fonts/conf.avail/65-nonlatin.conf b/fonts/conf.avail/65-nonlatin.conf index 53ac064..9306f74 100644 --- a/fonts/conf.avail/65-nonlatin.conf +++ b/fonts/conf.avail/65-nonlatin.conf @@ -23,8 +23,7 @@ Sampige padmaa Hapax Berbère - MS Gothic - UmePlus P Gothic + MS Mincho SimSun PMingLiu WenQuanYi Zen Hei @@ -43,8 +42,9 @@ AR PL Zenkai Uni ＭＳ 明朝 ZYSong18030 - UnBatang - Baekmuk Batang + NanumMyeongjo + UnBatang + Baekmuk Batang KacstQura Frank Ruehl CLM Lohit Bengali @@ -117,9 +117,10 @@ ＭＳ ゴシック ZYSong18030 TSCu_Paranar - UnDotum - Baekmuk Dotum - Baekmuk Gulim + NanumGothic + UnDotum + Baekmuk Dotum + Baekmuk Gulim KacstQura Lohit Bengali Lohit Gujarati @@ -160,11 +161,11 @@ AR PL SungtiL GB AR PL Mingti2L Big5 ZYSong18030 - UnBatang - UnDotum - Baekmuk Batang - Baekmuk Dotum - Baekmuk Gulim + NanumGothicCoding + NanumGothic + UnDotum + Baekmuk Dotum + Baekmuk Gulim TlwgTypo TlwgTypist TlwgTypewriter diff --git a/fonts/conf.avail/80-delicious.conf b/fonts/conf.avail/80-delicious.conf index 728f50c..845647b 100644 --- a/fonts/conf.avail/80-delicious.conf +++ b/fonts/conf.avail/80-delicious.conf @@ -5,7 +5,7 @@ - + Delicious diff --git a/fonts/conf.d/10-scale-bitmap-fonts.conf b/fonts/conf.d/10-scale-bitmap-fonts.conf new file mode 120000 index 0000000..56049bc --- /dev/null +++ b/fonts/conf.d/10-scale-bitmap-fonts.conf @@ -0,0 +1 @@ +/etc/fonts/conf.avail/10-scale-bitmap-fonts.conf \ No newline at end of file diff --git a/fonts/conf.d/20-fix-globaladvance.conf b/fonts/conf.d/20-fix-globaladvance.conf deleted file mode 120000 index 8fec131..0000000 --- a/fonts/conf.d/20-fix-globaladvance.conf +++ /dev/null @@ -1 +0,0 @@ -../conf.avail/20-fix-globaladvance.conf \ No newline at end of file diff --git a/fonts/fonts.conf b/fonts/fonts.conf index 059259a..e2d5567 100644 --- a/fonts/fonts.conf +++ b/fonts/fonts.conf @@ -25,6 +25,8 @@ /usr/share/fonts /usr/local/share/fonts + fonts + ~/.fonts - conf.d + /etc/fonts/conf.d /var/cache/fontconfig + fontconfig + ~/.fontconfig diff --git a/fonts/fonts.dtd b/fonts/fonts.dtd deleted file mode 100644 index cbdfdab..0000000 --- a/fonts/fonts.dtd +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/grub.d/00_header b/grub.d/00_header new file mode 100755 index 0000000..3c6370d --- /dev/null +++ b/grub.d/00_header @@ -0,0 +1,328 @@ +#! /bin/sh +set -e + +# grub-mkconfig helper script. +# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see . + +prefix="/usr" +exec_prefix="${prefix}" +datarootdir="${prefix}/share" +grub_lang=`echo $LANG | cut -d . -f 1` + +export TEXTDOMAIN=grub +export TEXTDOMAINDIR="${datarootdir}/locale" + +. "/usr/share/grub/grub-mkconfig_lib" + +# Do this as early as possible, since other commands might depend on it. +# (e.g. the `loadfont' command might need lvm or raid modules) +for i in ${GRUB_PRELOAD_MODULES} ; do + echo "insmod $i" +done + +if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi +if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then GRUB_DEFAULT='${saved_entry}' ; fi +if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi +if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=auto ; fi + +if [ "x${GRUB_DEFAULT_BUTTON}" = "x" ] ; then GRUB_DEFAULT_BUTTON="$GRUB_DEFAULT" ; fi +if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_entry}' ; fi +if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi + +cat << EOF +if [ -s \$prefix/grubenv ]; then + load_env +fi +EOF +if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then + cat < /dev/null ; then + font_path="${path}" + else + continue + fi + break 2 + done + done + if [ -n "${font_path}" ] ; then + cat << EOF +if [ x\$feature_default_font_path = xy ] ; then + font=unicode +else +EOF + # Make the font accessible + prepare_grub_to_access_device `${grub_probe} --target=device "${font_path}"` + cat << EOF + font="`make_system_path_relative_to_its_root "${font_path}"`" +fi + +if loadfont \$font ; then +EOF + else + cat << EOF +if loadfont unicode ; then +EOF + fi + fi + + cat << EOF + set gfxmode=${GRUB_GFXMODE} + load_video + insmod gfxterm +EOF + +# Gettext variables and module +if [ "x${LANG}" != "xC" ] ; then + cat << EOF + set locale_dir=\$prefix/locale + set lang=${grub_lang} + insmod gettext +EOF +fi + +cat <&2 + + prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"` + cat << EOF +insmod gfxmenu +EOF + themedir="`dirname "$GRUB_THEME"`" + for x in "$themedir"/*.pf2 "$themedir"/f/*.pf2; do + if [ -f "$x" ]; then + cat << EOF +loadfont (\$root)`make_system_path_relative_to_its_root $x` +EOF + fi + done + if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ] || [ x"`echo "$themedir"/*.jpeg`" != x"$themedir/*.jpeg" ]; then + cat << EOF +insmod jpeg +EOF + fi + if [ x"`echo "$themedir"/*.png`" != x"$themedir/*.png" ]; then + cat << EOF +insmod png +EOF + fi + if [ x"`echo "$themedir"/*.tga`" != x"$themedir/*.tga" ]; then + cat << EOF +insmod tga +EOF + fi + + cat << EOF +set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME` +export theme +EOF + elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \ + && is_path_readable_by_grub "$GRUB_BACKGROUND"; then + gettext_printf "Found background: %s\n" "$GRUB_BACKGROUND" >&2 + case "$GRUB_BACKGROUND" in + *.png) reader=png ;; + *.tga) reader=tga ;; + *.jpg|*.jpeg) reader=jpeg ;; + *) gettext "Unsupported image format" >&2; echo >&2; exit 1 ;; + esac + prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` + cat << EOF +insmod $reader +background_image -m stretch `make_system_path_relative_to_its_root "$GRUB_BACKGROUND"` +EOF + fi +fi + +make_timeout () +{ + if [ "x${1}" != "x" ] ; then + if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then + verbose= + else + verbose=" --verbose" + fi + cat << EOF +if sleep$verbose --interruptible ${1} ; then + set timeout=${2} +fi +EOF + else + cat << EOF +set timeout=${2} +EOF + fi +} + +if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then + cat <. + +prefix="/usr" +exec_prefix="${prefix}" +datarootdir="${prefix}/share" + +. "/usr/share/grub/grub-mkconfig_lib" + +export TEXTDOMAIN=grub +export TEXTDOMAINDIR="${datarootdir}/locale" + +CLASS="--class gnu-linux --class gnu --class os" + +if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux +else + OS="${GRUB_DISTRIBUTOR} GNU/Linux" + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" +fi + +# loop-AES arranges things so that /dev/loop/X can be our root device, but +# the initrds that Linux uses don't like that. +case ${GRUB_DEVICE} in + /dev/loop/*|/dev/loop[0-9]) + GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"` + ;; +esac + +if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ + || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ + || uses_abstraction "${GRUB_DEVICE}" lvm; then + LINUX_ROOT_DEVICE=${GRUB_DEVICE} +else + LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} +fi + +GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" + +if [ x"$GRUBFS" = x ]; then + GRUBFS="$(stat -f --printf=%T / || true)" +fi + +case x"$GRUBFS" in + xbtrfs) + rootsubvol="`make_system_path_relative_to_its_root /`" + rootsubvol="${rootsubvol#/}" + if [ "x${rootsubvol}" != x ]; then + GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}" + fi;; + xzfs) + rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` + bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`" + LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" + ;; +esac + +title_correction_code= + +linux_entry () +{ + os="$1" + version="$2" + type="$3" + args="$4" + + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" + fi + if [ x$type != xsimple ] ; then + case $type in + recovery) + title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; + *) + title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; + esac + if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then + replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" + quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" + title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;" + grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")" + fi + echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + else + echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + fi + if [ x$type != xrecovery ] ; then + save_default_entry | grub_add_tab + fi + + # Use ELILO's generic "efifb" when it's known to be available. + # FIXME: We need an interface to select vesafb in case efifb can't be used. + if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then + echo " load_video" | sed "s/^/$submenu_indentation/" + if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \ + && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then + echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/" + fi + else + if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then + echo " load_video" | sed "s/^/$submenu_indentation/" + fi + echo " set gfxpayload=$GRUB_GFXPAYLOAD_LINUX" | sed "s/^/$submenu_indentation/" + fi + + echo " insmod gzio" | sed "s/^/$submenu_indentation/" + + if [ x$dirname = x/ ]; then + if [ -z "${prepare_root_cache}" ]; then + prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | grub_add_tab)" + fi + printf '%s\n' "${prepare_root_cache}" | sed "s/^/$submenu_indentation/" + else + if [ -z "${prepare_boot_cache}" ]; then + prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)" + fi + printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" + fi + message="$(gettext_printf "Loading Linux %s ..." ${version})" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} +EOF + if test -n "${initrd}" ; then + # TRANSLATORS: ramdisk isn't identifier. Should be translated. + message="$(gettext_printf "Loading initial ramdisk ...")" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' + initrd ${rel_dirname}/${initrd} +EOF + fi + sed "s/^/$submenu_indentation/" << EOF +} +EOF +} + +machine=`uname -m` +case "x$machine" in + xi?86 | xx86_64) + list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do + if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi + done` ;; + *) + list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do + if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi + done` ;; +esac + +case "$machine" in + i?86) GENKERNEL_ARCH="x86" ;; + mips|mips64) GENKERNEL_ARCH="mips" ;; + mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;; + arm*) GENKERNEL_ARCH="arm" ;; + *) GENKERNEL_ARCH="$machine" ;; +esac + +prepare_boot_cache= +prepare_root_cache= +boot_device_id= +title_correction_code= + +# Extra indentation to add to menu entries in a submenu. We're not in a submenu +# yet, so it's empty. In a submenu it will be equal to '\t' (one tab). +submenu_indentation="" + +is_first_entry=true +while [ "x$list" != "x" ] ; do + linux=`version_find_latest $list` + gettext_printf "Found linux image: %s\n" "$linux" >&2 + basename=`basename $linux` + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` + version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + + initrd= + for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ + "initrd-${version}" "initramfs-${version}.img" \ + "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ + "initrd-${alt_version}" "initramfs-${alt_version}.img" \ + "initramfs-genkernel-${version}" \ + "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do + if test -e "${dirname}/${i}" ; then + initrd="$i" + break + fi + done + + config= + for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do + if test -e "${i}" ; then + config="${i}" + break + fi + done + + initramfs= + if test -n "${config}" ; then + initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"` + fi + + if test -n "${initrd}" ; then + gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2 + elif test -z "${initramfs}" ; then + # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's + # no initrd or builtin initramfs, it can't work here. + linux_root_device_thisversion=${GRUB_DEVICE} + fi + + if [ "x$is_first_entry" = xtrue ]; then + linux_entry "${OS}" "${version}" simple \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + + submenu_indentation="$grub_tab" + + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" + fi + # TRANSLATORS: %s is replaced with an OS name + echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" + fi + + linux_entry "${OS}" "${version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" + fi + + list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` + is_first_entry=false +done + +# If at least one kernel was found, then we need to +# add a closing '}' for the submenu command. +if [ x"$is_first_entry" != xtrue ]; then + echo '}' +fi + +echo "$title_correction_code" diff --git a/grub.d/20_linux_xen b/grub.d/20_linux_xen new file mode 100755 index 0000000..dbd8891 --- /dev/null +++ b/grub.d/20_linux_xen @@ -0,0 +1,278 @@ +#! /bin/sh +set -e + +# grub-mkconfig helper script. +# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see . + +prefix="/usr" +exec_prefix="${prefix}" +datarootdir="${prefix}/share" + +. "/usr/share/grub/grub-mkconfig_lib" + +export TEXTDOMAIN=grub +export TEXTDOMAINDIR="${datarootdir}/locale" + +CLASS="--class gnu-linux --class gnu --class os --class xen" + +if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux +else + OS="${GRUB_DISTRIBUTOR} GNU/Linux" + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" +fi + +# loop-AES arranges things so that /dev/loop/X can be our root device, but +# the initrds that Linux uses don't like that. +case ${GRUB_DEVICE} in + /dev/loop/*|/dev/loop[0-9]) + GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"` + ;; +esac + +if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ + || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ + || uses_abstraction "${GRUB_DEVICE}" lvm; then + LINUX_ROOT_DEVICE=${GRUB_DEVICE} +else + LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} +fi + +# Allow overriding GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT. +if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE}" ]; then + GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX_XEN_REPLACE}" +fi +if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; then + GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" +fi + +GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" + +if [ x"$GRUBFS" = x ]; then + GRUBFS="$(stat -f --printf=%T /)" +fi + +case x"$GRUBFS" in + xbtrfs) + rootsubvol="`make_system_path_relative_to_its_root /`" + rootsubvol="${rootsubvol#/}" + if [ "x${rootsubvol}" != x ]; then + GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}" + fi;; + xzfs) + rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` + bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`" + LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" + ;; +esac + +title_correction_code= + +linux_entry () +{ + os="$1" + version="$2" + xen_version="$3" + type="$4" + args="$5" + xen_args="$6" + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" + fi + if [ x$type != xsimple ] ; then + if [ x$type = xrecovery ] ; then + title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")" + else + title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" + fi + replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" + if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then + quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" + title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;" + grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")" + fi + echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + else + title="$(gettext_printf "%s, with Xen hypervisor" "${os}")" + echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + fi + if [ x$type != xrecovery ] ; then + save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/" + fi + + if [ -z "${prepare_boot_cache}" ]; then + prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)" + fi + printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" + xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})" + lmessage="$(gettext_printf "Loading Linux %s ..." ${version})" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$xmessage" | grub_quote)' + if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then + xen_rm_opts= + else + xen_rm_opts="no-real-mode edd=off" + fi + multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts} + echo '$(echo "$lmessage" | grub_quote)' + module ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args} +EOF + if test -n "${initrd}" ; then + # TRANSLATORS: ramdisk isn't identifier. Should be translated. + message="$(gettext_printf "Loading initial ramdisk ...")" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' + module ${rel_dirname}/${initrd} +EOF + fi + sed "s/^/$submenu_indentation/" << EOF +} +EOF +} + +linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do + if grub_file_is_not_garbage "$i"; then + basename=$(basename $i) + version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") + dirname=$(dirname $i) + config= + for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do + if test -e "${j}" ; then + config="${j}" + break + fi + done + if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then echo -n "$i " ; fi + fi + done` +if [ "x${linux_list}" = "x" ] ; then + exit 0 +fi + +file_is_not_sym () { + case "$1" in + */xen-syms-*) + return 1;; + *) + return 0;; + esac +} + +xen_list=`for i in /boot/xen*; do + if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then echo -n "$i " ; fi + done` +prepare_boot_cache= +boot_device_id= + +title_correction_code= + +machine=`uname -m` + +case "$machine" in + i?86) GENKERNEL_ARCH="x86" ;; + mips|mips64) GENKERNEL_ARCH="mips" ;; + mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;; + arm*) GENKERNEL_ARCH="arm" ;; + *) GENKERNEL_ARCH="$machine" ;; +esac + +# Extra indentation to add to menu entries in a submenu. We're not in a submenu +# yet, so it's empty. In a submenu it will be equal to '\t' (one tab). +submenu_indentation="" + +is_first_entry=true + +while [ "x${xen_list}" != "x" ] ; do + list="${linux_list}" + current_xen=`version_find_latest $xen_list` + xen_basename=`basename ${current_xen}` + xen_dirname=`dirname ${current_xen}` + rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname` + xen_version=`echo $xen_basename | sed -e "s,.gz$,,g;s,^xen-,,g"` + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" + fi + if [ "x$is_first_entry" != xtrue ]; then + echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" + fi + while [ "x$list" != "x" ] ; do + linux=`version_find_latest $list` + gettext_printf "Found linux image: %s\n" "$linux" >&2 + basename=`basename $linux` + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` + version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + + initrd= + for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ + "initrd-${version}" "initramfs-${version}.img" \ + "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ + "initrd-${alt_version}" "initramfs-${alt_version}.img" \ + "initramfs-genkernel-${version}" \ + "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" ; do + if test -e "${dirname}/${i}" ; then + initrd="$i" + break + fi + done + if test -n "${initrd}" ; then + gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2 + else + # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here. + linux_root_device_thisversion=${GRUB_DEVICE} + fi + + if [ "x$is_first_entry" = xtrue ]; then + linux_entry "${OS}" "${version}" "${xen_version}" simple \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" + + submenu_indentation="$grub_tab$grub_tab" + + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" + fi + # TRANSLATORS: %s is replaced with an OS name + echo "submenu '$(gettext_printf "Advanced options for %s (with Xen hypervisor)" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" + echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" + fi + is_first_entry=false + + linux_entry "${OS}" "${version}" "${xen_version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" "${xen_version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" + fi + + list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` + done + if [ x"$is_first_entry" != xtrue ]; then + echo ' }' + fi + xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $current_xen | tr '\n' ' '` +done + +# If at least one kernel was found, then we need to +# add a closing '}' for the submenu command. +if [ x"$is_first_entry" != xtrue ]; then + echo '}' +fi + +echo "$title_correction_code" diff --git a/grub.d/30_os-prober b/grub.d/30_os-prober new file mode 100755 index 0000000..4af65f2 --- /dev/null +++ b/grub.d/30_os-prober @@ -0,0 +1,298 @@ +#! /bin/sh +set -e + +# grub-mkconfig helper script. +# Copyright (C) 2006,2007,2008,2009 Free Software Foundation, Inc. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see . + +prefix="/usr" +exec_prefix="${prefix}" +datarootdir="${prefix}/share" + +export TEXTDOMAIN=grub +export TEXTDOMAINDIR="${datarootdir}/locale" + +. "/usr/share/grub/grub-mkconfig_lib" + +if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then + exit 0 +fi + +if [ -z "`which os-prober 2> /dev/null`" -o -z "`which linux-boot-prober 2> /dev/null`" ] ; then + # missing os-prober and/or linux-boot-prober + exit 0 +fi + +OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`" +if [ -z "${OSPROBED}" ] ; then + # empty os-prober output, nothing doing + exit 0 +fi + +osx_entry() { + if [ x$2 = x32 ]; then + # TRANSLATORS: it refers to kernel architecture (32-bit) + bitstr="$(gettext "(32-bit)")" + else + # TRANSLATORS: it refers to kernel architecture (64-bit) + bitstr="$(gettext "(64-bit)")" + fi + # TRANSLATORS: it refers on the OS residing on device %s + onstr="$(gettext_printf "(on %s)" "${DEVICE}")" + cat << EOF +menuentry '$(echo "${LONGNAME} $bitstr $onstr" | grub_quote)' --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${DEVICE}")' { +EOF + save_default_entry | grub_add_tab + prepare_grub_to_access_device ${DEVICE} | grub_add_tab + cat << EOF + load_video + set do_resume=0 + if [ /var/vm/sleepimage -nt10 / ]; then + if xnu_resume /var/vm/sleepimage; then + set do_resume=1 + fi + fi + if [ \$do_resume = 0 ]; then + xnu_uuid ${OSXUUID} uuid + if [ -f /Extra/DSDT.aml ]; then + acpi -e /Extra/DSDT.aml + fi + if [ /kernelcache -nt /System/Library/Extensions ]; then + $1 /kernelcache boot-uuid=\${uuid} rd=*uuid + else + $1 /mach_kernel boot-uuid=\${uuid} rd=*uuid + if [ /System/Library/Extensions.mkext -nt /System/Library/Extensions ]; then + xnu_mkext /System/Library/Extensions.mkext + else + xnu_kextdir /System/Library/Extensions + fi + fi + if [ -f /Extra/Extensions.mkext ]; then + xnu_mkext /Extra/Extensions.mkext + fi + if [ -d /Extra/Extensions ]; then + xnu_kextdir /Extra/Extensions + fi + if [ -f /Extra/devprop.bin ]; then + xnu_devprop_load /Extra/devprop.bin + fi + if [ -f /Extra/splash.jpg ]; then + insmod jpeg + xnu_splash /Extra/splash.jpg + fi + if [ -f /Extra/splash.png ]; then + insmod png + xnu_splash /Extra/splash.png + fi + if [ -f /Extra/splash.tga ]; then + insmod tga + xnu_splash /Extra/splash.tga + fi + fi +} +EOF +} + +used_osprober_linux_ids= + +for OS in ${OSPROBED} ; do + DEVICE="`echo ${OS} | cut -d ':' -f 1`" + LONGNAME="`echo ${OS} | cut -d ':' -f 2 | tr '^' ' '`" + LABEL="`echo ${OS} | cut -d ':' -f 3 | tr '^' ' '`" + BOOT="`echo ${OS} | cut -d ':' -f 4`" + BTRFS="`echo ${OS} | cut -d ':' -f 5`" + if [ "x$BTRFS" = "xbtrfs" ]; then + BTRFSuuid="`echo ${OS} | cut -d ':' -f 6`" + BTRFSsubvol="`echo ${OS} | cut -d ':' -f 7`" + fi + + if [ -z "${LONGNAME}" ] ; then + LONGNAME="${LABEL}" + fi + + gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&2 + + case ${BOOT} in + chain) + + onstr="$(gettext_printf "(on %s)" "${DEVICE}")" + cat << EOF +menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --class os \$menuentry_id_option 'osprober-chain-$(grub_get_device_id "${DEVICE}")' { +EOF + save_default_entry | grub_add_tab + prepare_grub_to_access_device ${DEVICE} | grub_add_tab + + case ${LONGNAME} in + Windows\ Vista*|Windows\ 7*|Windows\ Server\ 2008*) + ;; + *) + cat << EOF + drivemap -s (hd0) \${root} +EOF + ;; + esac + + cat < /dev/null; do + counter=$((counter+1)); + done + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${DEVICE}")" + fi + used_osprober_linux_ids="$used_osprober_linux_ids 'osprober-gnulinux-$LKERNEL-${recovery_params}-$counter-$boot_device_id'" + + if [ -z "${prepare_boot_cache}" ]; then + prepare_boot_cache="$(prepare_grub_to_access_device ${LBOOT} | grub_add_tab)" + fi + + if [ "x$is_first_entry" = xtrue ]; then + cat << EOF +menuentry '$(echo "$OS $onstr" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' { +EOF + save_default_entry | grub_add_tab + printf '%s\n' "${prepare_boot_cache}" + cat << EOF + linux ${LKERNEL} ${LPARAMS} +EOF + if [ -n "${LINITRD}" ] ; then + cat << EOF + initrd ${LINITRD} +EOF + fi + cat << EOF +} +EOF + echo "submenu '$(gettext_printf "Advanced options for %s" "${OS} $onstr" | grub_quote)' \$menuentry_id_option 'osprober-gnulinux-advanced-$boot_device_id' {" + is_first_entry=false + fi + title="${LLABEL} $onstr" + cat << EOF + menuentry '$(echo "$title" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-$LKERNEL-${recovery_params}-$boot_device_id' { +EOF + save_default_entry | sed -e "s/^/$grub_tab$grub_tab/" + printf '%s\n' "${prepare_boot_cache}" | grub_add_tab + cat << EOF + linux ${LKERNEL} ${LPARAMS} +EOF + if [ -n "${LINITRD}" ] ; then + cat << EOF + initrd ${LINITRD} +EOF + fi + cat << EOF + } +EOF + if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then + replacement_title="$(echo "Advanced options for ${OS} $onstr" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" + quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" + title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;" + grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")" + fi + done + if [ x"$is_first_entry" != xtrue ]; then + echo '}' + fi + echo "$title_correction_code" + ;; + macosx) + OSXUUID="`${grub_probe} --target=fs_uuid --device ${DEVICE} 2> /dev/null`" + osx_entry xnu_kernel 32 + osx_entry xnu_kernel64 64 + ;; + hurd) + onstr="$(gettext_printf "(on %s)" "${DEVICE}")" + cat << EOF +menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class hurd --class gnu --class os \$menuentry_id_option 'osprober-gnuhurd-/boot/gnumach.gz-false-$(grub_get_device_id "${DEVICE}")' { +EOF + save_default_entry | grub_add_tab + prepare_grub_to_access_device ${DEVICE} | grub_add_tab + grub_device="`${grub_probe} --device ${DEVICE} --target=drive`" + mach_device="`echo "${grub_device}" | sed -e 's/(\(hd.*\),msdos\(.*\))/\1s\2/'`" + grub_fs="`${grub_probe} --device ${DEVICE} --target=fs`" + case "${grub_fs}" in + *fs) hurd_fs="${grub_fs}" ;; + *) hurd_fs="${grub_fs}fs" ;; + esac + cat << EOF + multiboot /boot/gnumach.gz root=device:${mach_device} + module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\ + --multiboot-command-line='\${kernel-command-line}' \\ + --host-priv-port='\${host-port}' \\ + --device-master-port='\${device-port}' \\ + --exec-server-task='\${exec-task}' -T typed '\${root}' \\ + '\$(task-create)' '\$(task-resume)' + module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)' +} +EOF + ;; + *) + echo -n " " + # TRANSLATORS: %s is replaced by OS name. + gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&2 + ;; + esac +done diff --git a/grub.d/40_custom b/grub.d/40_custom new file mode 100755 index 0000000..48068de --- /dev/null +++ b/grub.d/40_custom @@ -0,0 +1,5 @@ +#!/bin/sh +exec tail -n +3 $0 +# This file provides an easy way to add custom menu entries. Simply type the +# menu entries you want to add after this comment. Be careful not to change +# the 'exec tail' line above. diff --git a/grub.d/41_custom b/grub.d/41_custom new file mode 100755 index 0000000..fcc21a9 --- /dev/null +++ b/grub.d/41_custom @@ -0,0 +1,9 @@ +#!/bin/sh +cat <&1) + eend $? "${output}" + + local pat="/dev/md_d*" + set -- ${pat} + if [ "$*" != "${pat}" ] ; then + ebegin "Creating RAID device partitions" + blockdev "$@" + eend $? + # wait because vgscan runs next, and we want udev to fire + sleep 1 fi - start_addon raid + return 0 } stop() { - stop_addon raid + local output + + # XXX: Maybe drop this check ? + [ ! -e /etc/mdadm/mdadm.conf ] && [ ! -e /etc/mdadm.conf ] && return 0 + + ebegin "Shutting down RAID devices (mdadm)" + output=$(mdadm -Ss 2>&1) + eend $? "${output}" } diff --git a/init.d/ntp-client b/init.d/ntp-client index 78715e2..a50a6ef 100755 --- a/init.d/ntp-client +++ b/init.d/ntp-client @@ -1,11 +1,11 @@ #!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.11 2007/03/09 17:24:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.12 2012/11/11 05:58:25 vapier Exp $ depend() { before cron portmap - need net + after net use dns logger } diff --git a/init.d/sntp b/init.d/sntp new file mode 100755 index 0000000..cd42b44 --- /dev/null +++ b/init.d/sntp @@ -0,0 +1,27 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/sntp.rc,v 1.1 2013/07/06 07:15:02 pacho Exp $ + +depend() { + before cron portmap + after net + use dns logger +} + +checkconfig() { + if [ -z "${SNTP_OPTS}" ] ; then + eerror "Please edit /etc/conf.d/sntp" + eerror "I need to know what server/options to use!" + return 1 + fi + return 0 +} + +start() { + checkconfig || return $? + + ebegin "Setting clock via SNTP" + /usr/bin/sntp ${SNTP_OPTS} + eend $? "Failed to set clock" +} diff --git a/init.d/spamd b/init.d/spamd index d0708a4..63eef62 100755 --- a/init.d/spamd +++ b/init.d/spamd @@ -1,12 +1,12 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.3.1-spamd.init,v 1.4 2011/09/14 23:00:38 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.3.1-spamd.init,v 1.6 2013/10/17 11:44:12 zlogene Exp $ # NB: Config is in /etc/conf.d/spamd # Provide a default location if they haven't in /etc/conf.d/spamd -PIDFILE=${PIDFILE:-/var/run/spamd.pid} +PIDFILE=${PIDFILE:-/run/spamd.pid} extra_started_commands="reload" @@ -14,8 +14,8 @@ depend() { need net before mta use logger - use postgresql - use mysql + use postgresql + use mysql } start() { @@ -41,6 +41,6 @@ stop() { reload() { ebegin "Reloading configuration" - kill -HUP $(< ${PIDFILE}) + start-stop-daemon --signal HUP --quiet --pidfile ${PIDFILE} eend $? } diff --git a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf index 62d62a0..eacf0c4 100644 --- a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf +++ b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf @@ -1,2 +1,4 @@ +/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.3/32 +/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.3 /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/32 /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3 diff --git a/mdadm.conf b/mdadm.conf index 7bdff67..d9d8d39 100644 --- a/mdadm.conf +++ b/mdadm.conf @@ -59,7 +59,7 @@ # When used in --follow (aka --monitor) mode, mdadm needs a # mail address and/or a program. This can be given with "mailaddr" # and "program" lines to that monitoring can be started using -# mdadm --follow --scan & echo $! > /var/run/mdadm +# mdadm --follow --scan & echo $! > /run/mdadm/mon.pid # If the lines are not found, mdadm will exit quietly #MAILADDR root@mydomain.tld #PROGRAM /usr/sbin/handle-mdadm-events diff --git a/pam.d/system-auth-winbind b/pam.d/system-auth-winbind new file mode 100644 index 0000000..454b94d --- /dev/null +++ b/pam.d/system-auth-winbind @@ -0,0 +1,18 @@ +#%PAM-1.0 +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/system-auth-winbind.pam,v 1.1 2011/06/30 15:50:28 dagger Exp $ + +auth required pam_env.so +auth sufficient pam_winbind.so +auth sufficient pam_unix.so likeauth nullok use_first_pass +auth required pam_deny.so + +account sufficient pam_winbind.so +account required pam_unix.so + +password required pam_cracklib.so retry=3 +password sufficient pam_unix.so nullok use_authtok md5 shadow +password required pam_deny.so + +session required pam_mkhomedir.so skel=/etc/skel/ umask=0022 +session required pam_limits.so +session required pam_unix.so diff --git a/php/apache2-php5.5/php.ini b/php/apache2-php5.5/php.ini index 5e42c6d..0a137c7 100644 --- a/php/apache2-php5.5/php.ini +++ b/php/apache2-php5.5/php.ini @@ -197,13 +197,12 @@ engine = On ; This directive determines whether or not PHP will recognize code between -; tags as PHP source which should be processed as such. It's been -; recommended for several years that you not use the short tag "short cut" and -; instead to use the full tag combination. With the wide spread use -; of XML and use of these tags by other languages, the server can become easily -; confused and end up parsing the wrong code in the wrong context. But because -; this short cut has been a feature for such a long time, it's currently still -; supported for backwards compatibility, but we recommend you don't use them. +; tags as PHP source which should be processed as such. It is +; generally recommended that should be used and that this feature +; should be disabled, as enabling it may result in issues when generating XML +; documents, however this remains supported for backward compatibility reasons. +; Note that this directive does not control the tags as PHP source which should be processed as such. It's been -; recommended for several years that you not use the short tag "short cut" and -; instead to use the full tag combination. With the wide spread use -; of XML and use of these tags by other languages, the server can become easily -; confused and end up parsing the wrong code in the wrong context. But because -; this short cut has been a feature for such a long time, it's currently still -; supported for backwards compatibility, but we recommend you don't use them. +; tags as PHP source which should be processed as such. It is +; generally recommended that should be used and that this feature +; should be disabled, as enabling it may result in issues when generating XML +; documents, however this remains supported for backward compatibility reasons. +; Note that this directive does not control the tags as PHP source which should be processed as such. It's been -; recommended for several years that you not use the short tag "short cut" and -; instead to use the full tag combination. With the wide spread use -; of XML and use of these tags by other languages, the server can become easily -; confused and end up parsing the wrong code in the wrong context. But because -; this short cut has been a feature for such a long time, it's currently still -; supported for backwards compatibility, but we recommend you don't use them. +; tags as PHP source which should be processed as such. It is +; generally recommended that should be used and that this feature +; should be disabled, as enabling it may result in issues when generating XML +; documents, however this remains supported for backward compatibility reasons. +; Note that this directive does not control the tags as PHP source which should be processed as such. It's been -; recommended for several years that you not use the short tag "short cut" and -; instead to use the full tag combination. With the wide spread use -; of XML and use of these tags by other languages, the server can become easily -; confused and end up parsing the wrong code in the wrong context. But because -; this short cut has been a feature for such a long time, it's currently still -; supported for backwards compatibility, but we recommend you don't use them. +; tags as PHP source which should be processed as such. It is +; generally recommended that should be used and that this feature +; should be disabled, as enabling it may result in issues when generating XML +; documents, however this remains supported for backward compatibility reasons. +; Note that this directive does not control the tags as PHP source which should be processed as such. It's been -; recommended for several years that you not use the short tag "short cut" and -; instead to use the full tag combination. With the wide spread use -; of XML and use of these tags by other languages, the server can become easily -; confused and end up parsing the wrong code in the wrong context. But because -; this short cut has been a feature for such a long time, it's currently still -; supported for backwards compatibility, but we recommend you don't use them. +; tags as PHP source which should be processed as such. It is +; generally recommended that should be used and that this feature +; should be disabled, as enabling it may result in issues when generating XML +; documents, however this remains supported for backward compatibility reasons. +; Note that this directive does not control the