Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Baruch Siach <baruch@tkos.co.il>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] initscripts: new package
Date: Mon, 13 Oct 2014 13:21:49 +0300	[thread overview]
Message-ID: <20141013102149.GF3500@tarshish> (raw)
In-Reply-To: <1413194625-31516-1-git-send-email-maxime.hadjinlian@gmail.com>

Hi Maxime,

On Mon, Oct 13, 2014 at 12:03:45PM +0200, Maxime Hadjinlian wrote:
> @@ -34,9 +38,12 @@ define SYSVINIT_INSTALL_TARGET_CMDS
>  	for x in halt init shutdown killall5; do \
>  		$(INSTALL) -D -m 0755 $(@D)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1; \
>  	done
> +<<<<<<< HEAD
>  	# Override BusyBox's inittab with an inittab compatible with
>  	# sysvinit
>  	$(INSTALL) -D -m 0644 package/sysvinit/inittab $(TARGET_DIR)/etc/inittab
> +=======
> +>>>>>>> initscripts: new package
>  	ln -sf /sbin/halt $(TARGET_DIR)/sbin/reboot
>  	ln -sf /sbin/halt $(TARGET_DIR)/sbin/poweroff
>  	ln -sf killall5 $(TARGET_DIR)/sbin/pidof

Something went wrong here.

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

  reply	other threads:[~2014-10-13 10:21 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-13 10:03 [Buildroot] [PATCH] initscripts: new package Maxime Hadjinlian
2014-10-13 10:21 ` Baruch Siach [this message]
2014-10-13 10:23   ` Maxime Hadjinlian
  -- strict thread matches above, loose matches on Subject: below --
2014-10-13 15:53 Maxime Hadjinlian
2014-10-13  9:03 Maxime Hadjinlian
2014-10-13 10:50 ` Jérôme Pouiller
2014-10-13 12:32   ` Maxime Hadjinlian

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20141013102149.GF3500@tarshish \
    --to=baruch@tkos.co.il \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox