diff options
| -rw-r--r-- | init | 4 | ||||
| -rw-r--r-- | install/base | 4 | ||||
| -rwxr-xr-x | mkinitcpio | 6 | ||||
| -rw-r--r-- | mkinitcpio.5.txt | 3 |
4 files changed, 1 insertions, 16 deletions
@@ -80,10 +80,6 @@ if [ "${break}" = "y" ]; then launch_interactive_shell fi -if [ -f "/message" ]; then - msg "$(cat /message)" -fi - # Mount root at /new_root mkdir -p /new_root ${mount_handler} /new_root diff --git a/install/base b/install/base index bd1349b..40f9c25 100644 --- a/install/base +++ b/install/base @@ -21,10 +21,6 @@ build() add_file "/lib/initcpio/init_functions" "/init_functions" add_file "/lib/initcpio/init" "/init" add_file "${CONFIG}" "/config" - if [ -n "${MESSAGE}" ]; then - echo -e "${MESSAGE}" > ${MESSAGEFILE} - add_file "${MESSAGEFILE}" "/message" - fi add_file "/etc/modprobe.d/usb-load-ehci-first.conf" SCRIPT="" } @@ -13,7 +13,6 @@ shopt -s extglob # Settings -MESSAGEFILE=$TMPDIR/message KERNELVERSION=$(uname -r) FUNCTIONS=functions CONFIG=mkinitcpio.conf @@ -22,7 +21,7 @@ INSTDIR=install PRESETDIR=mkinitcpio.d COMPRESSION=gzip -declare TMPDIR BASEDIR MODULE_FILE GENIMG PRESET MESSAGE COMPRESSION_OPTIONS BUILDROOT +declare TMPDIR BASEDIR MODULE_FILE GENIMG PRESET COMPRESSION_OPTIONS BUILDROOT declare NC= BOLD= BLUE= GREEN= RED= YELLOW= declare -i QUIET=1 SHOW_AUTOMODS=0 SAVELIST=0 COLOR=1 declare -a SKIPHOOKS ADDED_MODULES @@ -50,7 +49,6 @@ usage: $APPNAME [options] -L List all available hooks. -M Display modules found via autodetection. -n Disable colorized output messages. - -m MESSAGE Print MESSAGE before passing control to init. -p PRESET Build specified preset from /etc/mkinitcpio.d -S SKIPHOOKS Skip SKIPHOOKS (comma-separated) when building the image. -s Save build directory. default: no @@ -109,7 +107,6 @@ while getopts ':c:k:sb:g:p:m:nvH:LMhS:t:' arg; do b) BASEDIR="${OPTARG}" ;; g) GENIMG="${OPTARG}" ;; p) PRESET="${OPTARG}" ;; - m) MESSAGE="${OPTARG}" ;; n) COLOR=0 ;; v) QUIET=0 ;; S) OLDIFS=${IFS} @@ -177,7 +174,6 @@ if [[ $PRESET ]]; then # Use -b, -m and -v options specified earlier declare -a preset_mkopts preset_cmd [[ $BASEDIR ]] && preset_mkopts+=(-b "$BASEDIR") - [[ $MESSAGE ]] && preset_mkopts+=(-m "$MESSAGE") (( QUIET )) || preset_mkopts+=(-v) # Build all images . "$PRESETDIR/$PRESET.preset" diff --git a/mkinitcpio.5.txt b/mkinitcpio.5.txt index 66bab68..9871099 100644 --- a/mkinitcpio.5.txt +++ b/mkinitcpio.5.txt @@ -33,9 +33,6 @@ Options *-p* 'preset':: Build initial ramdisk according to specified 'preset'. Presets are found in /etc/mkinitcpio.d -*-m* 'message':: - Print 'message' before passing control to init. - *-n*:: Disable color output. |