Merge branch 'master' of github.com:coreos/coreos-cloudinit

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>

system/filesystem_freebsd.go

@@ -0,0 +1,19 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package system
+
+func ResizeRootFS() error {
+	return nil
+}

system/filesystem_linux.go

@@ -0,0 +1,100 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package system
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"io"
+	"log"
+	"os"
+	"os/exec"
+	"strings"
+
+	"github.com/vtolstov/go-ioctl"
+)
+
+func ResizeRootFS() error {
+	var err error
+	var stdout io.ReadCloser
+	var stdin bytes.Buffer
+
+	output, err := exec.Command("findmnt", "-n", "-o", "source", "/").CombinedOutput()
+	if err != nil {
+		return err
+	}
+
+	mountpoint := strings.TrimSpace(string(output))
+	partstart := "2048"
+	device := mountpoint[:len(mountpoint)-1]
+	partition := mountpoint[len(mountpoint)-1:]
+
+	cmd := exec.Command("fdisk", "-l", "-u", device)
+	stdout, err = cmd.StdoutPipe()
+	if err != nil {
+		log.Printf("failed to open %s via fdisk %s 2\n", device, err.Error())
+		return err
+	}
+	r := bufio.NewReader(stdout)
+
+	if err = cmd.Start(); err != nil {
+		log.Printf("failed to open %s via fdisk %s 3\n", device, err.Error())
+		return err
+	}
+
+	for {
+		line, err := r.ReadString('\n')
+		if err != nil {
+			break
+		}
+
+		if strings.HasPrefix(line, device+partition) {
+			ps := strings.Fields(line) // /dev/sda1      *      4096   251658239   125827072  83 Linux
+			if ps[1] == "*" {
+				partstart = ps[2]
+			} else {
+				partstart = ps[1]
+			}
+		}
+	}
+
+	if err = cmd.Wait(); err != nil || partstart == "" {
+		return fmt.Errorf("failed to open %s via fdisk 4\n", device)
+	}
+
+	stdin.Write([]byte("o\nn\np\n1\n" + partstart + "\n\na\n1\nw\n"))
+	cmd = exec.Command("fdisk", "-u", device)
+	cmd.Stdin = &stdin
+	cmd.Run()
+	stdin.Reset()
+
+	w, err := os.OpenFile(device, os.O_WRONLY, 0600)
+	if err == nil {
+		defer w.Close()
+		err = ioctl.BlkRRPart(w.Fd())
+		if err == nil {
+			return exec.Command("resize2fs", device+partition).Run()
+		}
+	}
+	for _, name := range []string{"partprobe", "kpartx"} {
+		if _, err = exec.LookPath(name); err == nil {
+			if err = exec.Command(name, device).Run(); err == nil {
+				return nil
+			}
+		}
+	}
+	return exec.Command("resize2fs", device+partition).Run()
+}

system/user.go

@@ -79,6 +79,10 @@ func CreateUser(u *config.User) error {
 		args = append(args, "--no-log-init")
 	}
 
+	if u.Shell != "" {
+		args = append(args, "--shell", u.Shell)
+	}
+
 	args = append(args, u.Name)
 
 	output, err := exec.Command("useradd", args...).CombinedOutput()