From 6ead9b92c7e8d98ccfe3627e145cbe340d0b7cee Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sat, 13 Feb 2010 09:25:37 -0600 Subject: [PATCH] Remove file-creation patches, make them distinct files in overlay --- overlay/boot/boot.config | 1 + overlay/boot/loader.conf | 9 +++++++++ overlay/etc/bashrc | 17 +++++++++++++++++ overlay/etc/fstab | 3 +++ overlay/etc/inputrc | 17 +++++++++++++++++ overlay/etc/rc.conf | 14 ++++++++++++++ patch/boot_boot.config-config.patch | 6 ------ patch/boot_loader.conf-config.patch | 14 -------------- patch/etc_bashrc-sensible-defaults.patch | 21 --------------------- patch/etc_fstab-sensible-defaults.patch | 7 ------- patch/etc_inputrc-sensible-defaults.patch | 21 --------------------- patch/etc_rc.conf-sensible-defaults.patch | 18 ------------------ 12 files changed, 61 insertions(+), 87 deletions(-) create mode 100644 overlay/boot/boot.config create mode 100644 overlay/boot/loader.conf create mode 100644 overlay/etc/bashrc create mode 100644 overlay/etc/fstab create mode 100644 overlay/etc/inputrc create mode 100644 overlay/etc/rc.conf delete mode 100644 patch/boot_boot.config-config.patch delete mode 100644 patch/boot_loader.conf-config.patch delete mode 100644 patch/etc_bashrc-sensible-defaults.patch delete mode 100644 patch/etc_fstab-sensible-defaults.patch delete mode 100644 patch/etc_inputrc-sensible-defaults.patch delete mode 100644 patch/etc_rc.conf-sensible-defaults.patch diff --git a/overlay/boot/boot.config b/overlay/boot/boot.config new file mode 100644 index 0000000..1ab75d3 --- /dev/null +++ b/overlay/boot/boot.config @@ -0,0 +1 @@ +/loader -h -S115200 diff --git a/overlay/boot/loader.conf b/overlay/boot/loader.conf new file mode 100644 index 0000000..5680ee6 --- /dev/null +++ b/overlay/boot/loader.conf @@ -0,0 +1,9 @@ +console="comconsole" +comconsole_speed="115200" + +ahci_load="YES" +siis_load="YES" +zlib_load="YES" +geom_uzip_load="YES" + +vfs.root.mountfrom="cd9660:/dev/iso9660/root" diff --git a/overlay/etc/bashrc b/overlay/etc/bashrc new file mode 100644 index 0000000..5c42208 --- /dev/null +++ b/overlay/etc/bashrc @@ -0,0 +1,17 @@ +# Enable emacs line editing mode +set -o emacs + +# Some useful aliases +alias h='fc -l' +alias j=jobs +alias m=$PAGER +alias ll='ls -laFo' +alias l='ls -l' +alias g='egrep -i' +alias ls='ls -G' +alias pp='ps axopid,user,state,command' + +# Be paranoid +alias cp='cp -ip' +alias mv='mv -i' +alias rm='rm -i' diff --git a/overlay/etc/fstab b/overlay/etc/fstab new file mode 100644 index 0000000..4ca34d6 --- /dev/null +++ b/overlay/etc/fstab @@ -0,0 +1,3 @@ +/dev/iso9660/root / cd9660 ro 0 0 +/dev/ufs/boot /boot/boot ufs ro,noatime,sync 0 2 +/dev/ufs/conf /conf ufs ro,noatime,sync 0 2 diff --git a/overlay/etc/inputrc b/overlay/etc/inputrc new file mode 100644 index 0000000..6f7925e --- /dev/null +++ b/overlay/etc/inputrc @@ -0,0 +1,17 @@ +set meta-flag on +set input-meta on +set convert-meta off +set output-meta on + +"\e[1~": beginning-of-line +"\e[4~": end-of-line +"\e[5~": beginning-of-history +"\e[6~": end-of-history +"\e[3~": delete-char +"\e[2~": quoted-insert +"\e[5C": forward-word +"\e[5D": backward-word + +# fix Home and End for German users +"\e[7~": beginning-of-line +"\e[8~": end-of-line diff --git a/overlay/etc/rc.conf b/overlay/etc/rc.conf new file mode 100644 index 0000000..e6feeea --- /dev/null +++ b/overlay/etc/rc.conf @@ -0,0 +1,14 @@ +# System config +hostname="ss4200.cyberleo.net" +local_startup="/etc/local/rc.d" +ifconfig_em0="DHCP" + +# Daemon configuration +sshd_enable="YES" +gkrellmd_enable="YES" + +# Disable sendmail +sendmail_enable="NONE" +sendmail_submit_enable="NO" +sendmail_outbound_enable="NO" +sendmail_msp_queue_enable="NO" diff --git a/patch/boot_boot.config-config.patch b/patch/boot_boot.config-config.patch deleted file mode 100644 index 7eb1da3..0000000 --- a/patch/boot_boot.config-config.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- /dev/null 2010-01-10 20:33:01.000000000 -0600 -+++ boot/boot.config 2010-01-03 07:48:07.000000000 -0600 -@@ -0,0 +1,2 @@ -+/loader -h -S115200 -+ - diff --git a/patch/boot_loader.conf-config.patch b/patch/boot_loader.conf-config.patch deleted file mode 100644 index 8a3f162..0000000 --- a/patch/boot_loader.conf-config.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- /dev/null 2010-01-10 20:33:01.000000000 -0600 -+++ boot/loader.conf 2010-01-03 08:52:40.000000000 -0600 -@@ -0,0 +1,10 @@ -+console="comconsole" -+comconsole_speed="115200" -+ -+ahci_load="YES" -+siis_load="YES" -+zlib_load="YES" -+geom_uzip_load="YES" -+ -+vfs.root.mountfrom="cd9660:/dev/iso9660/root" -+ - diff --git a/patch/etc_bashrc-sensible-defaults.patch b/patch/etc_bashrc-sensible-defaults.patch deleted file mode 100644 index 4092073..0000000 --- a/patch/etc_bashrc-sensible-defaults.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- /dev/null 2010-01-24 09:56:47.000000000 +0000 -+++ etc/bashrc 2010-01-24 09:57:28.000000000 +0000 -@@ -0,0 +1,18 @@ -+# Enable emacs line editing mode -+set -o emacs -+ -+# Some useful aliases -+alias h='fc -l' -+alias j=jobs -+alias m=$PAGER -+alias ll='ls -laFo' -+alias l='ls -l' -+alias g='egrep -i' -+alias ls='ls -G' -+alias pp='ps axopid,user,state,command' -+ -+# Be paranoid -+alias cp='cp -ip' -+alias mv='mv -i' -+alias rm='rm -i' -+ diff --git a/patch/etc_fstab-sensible-defaults.patch b/patch/etc_fstab-sensible-defaults.patch deleted file mode 100644 index 59e5088..0000000 --- a/patch/etc_fstab-sensible-defaults.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- /dev/null 2010-01-10 20:44:00.000000000 -0600 -+++ etc/fstab 2010-01-10 13:19:32.000000000 -0600 -@@ -0,0 +1,4 @@ -+/dev/iso9660/root / cd9660 ro 0 0 -+/dev/ufs/boot /boot/boot ufs ro,noatime,sync 0 2 -+/dev/ufs/conf /conf ufs ro,noatime,sync 0 2 -+ diff --git a/patch/etc_inputrc-sensible-defaults.patch b/patch/etc_inputrc-sensible-defaults.patch deleted file mode 100644 index 434d4c2..0000000 --- a/patch/etc_inputrc-sensible-defaults.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- /dev/null 2010-01-24 09:36:47.000000000 +0000 -+++ etc/inputrc 2010-01-24 09:36:29.000000000 +0000 -@@ -0,0 +1,18 @@ -+set meta-flag on -+set input-meta on -+set convert-meta off -+set output-meta on -+ -+"\e[1~": beginning-of-line -+"\e[4~": end-of-line -+"\e[5~": beginning-of-history -+"\e[6~": end-of-history -+"\e[3~": delete-char -+"\e[2~": quoted-insert -+"\e[5C": forward-word -+"\e[5D": backward-word -+ -+# fix Home and End for German users -+"\e[7~": beginning-of-line -+"\e[8~": end-of-line -+ diff --git a/patch/etc_rc.conf-sensible-defaults.patch b/patch/etc_rc.conf-sensible-defaults.patch deleted file mode 100644 index 5f5d021..0000000 --- a/patch/etc_rc.conf-sensible-defaults.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- /dev/null 2010-01-24 09:33:48.000000000 +0000 -+++ etc/rc.conf 2010-01-24 09:34:08.000000000 +0000 -@@ -0,0 +1,15 @@ -+# System config -+hostname="ss4200.cyberleo.net" -+local_startup="/etc/local/rc.d" -+ifconfig_em0="DHCP" -+ -+# Daemon configuration -+sshd_enable="YES" -+gkrellmd_enable="YES" -+ -+# Disable sendmail -+sendmail_enable="NONE" -+sendmail_submit_enable="NO" -+sendmail_outbound_enable="NO" -+sendmail_msp_queue_enable="NO" -+ -- 2.42.0